Do not mistakenly report that compositing could not be enabled.

The compositing kcm now results in two reconfigurations of KWin,
and the second one meant that waitForCompositingSetup() didn't work
correctly.


svn path=/trunk/KDE/kdebase/workspace/; revision=960555
This commit is contained in:
Luboš Luňák 2009-04-28 16:20:26 +00:00
parent 91f0305942
commit e9e08c35cb

View file

@ -1001,10 +1001,11 @@ void Workspace::reconfigure()
*/ */
bool Workspace::waitForCompositingSetup() bool Workspace::waitForCompositingSetup()
{ {
if( !reconfigureTimer.isActive() ) if( reconfigureTimer.isActive() )
return false; {
reconfigureTimer.stop(); reconfigureTimer.stop();
slotReconfigure(); slotReconfigure();
}
return compositingActive(); return compositingActive();
} }