From e9e08c35cbb59d158b0ee8bac4dff83ba685a68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Tue, 28 Apr 2009 16:20:26 +0000
Subject: [PATCH] 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
---
 workspace.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index ea6ca10974..cb375b1221 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1001,10 +1001,11 @@ void Workspace::reconfigure()
  */
 bool Workspace::waitForCompositingSetup()
     {
-    if( !reconfigureTimer.isActive() )
-        return false;
-    reconfigureTimer.stop();
-    slotReconfigure();
+    if( reconfigureTimer.isActive() )
+        {
+        reconfigureTimer.stop();
+        slotReconfigure();
+        }
     return compositingActive();
     }