Merge branch 'KDE/4.8'

This commit is contained in:
Thomas Lübking 2012-02-08 20:19:41 +01:00
commit b052f6429f

View file

@ -1803,7 +1803,8 @@ void PresentWindowsEffect::setHighlightedWindow(EffectWindow *w)
if (w == m_highlightedWindow || (w != NULL && !m_motionManager.isManaging(w))) if (w == m_highlightedWindow || (w != NULL && !m_motionManager.isManaging(w)))
return; return;
m_closeView->hide(); if (m_closeView)
m_closeView->hide();
if (m_highlightedWindow) { if (m_highlightedWindow) {
effects->setElevatedWindow(m_highlightedWindow, false); effects->setElevatedWindow(m_highlightedWindow, false);
m_highlightedWindow->addRepaintFull(); // Trigger the first repaint m_highlightedWindow->addRepaintFull(); // Trigger the first repaint