From 868e08f380f850ee9287228f85b672557ec7819e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Fri, 4 Dec 2009 08:50:13 +0000
Subject: [PATCH] Revertlast, will be fixed properly. Next time when you decide
 to revert something, please at least look at the commit you're reverting -
 this is obviously broken too. CCMAIL: Andreas Hartmetz <ahartmetz@gmail.com>

svn path=/trunk/KDE/kdebase/workspace/; revision=1058203
---
 options.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/options.cpp b/options.cpp
index 78faf3327d..f408aee808 100644
--- a/options.cpp
+++ b/options.cpp
@@ -58,8 +58,8 @@ Options::~Options()
 unsigned long Options::updateSettings()
     {
     KSharedConfig::Ptr _config = KGlobal::config();
-    // read decoration settings
-    const unsigned long changed = KDecorationOptions::updateSettings( _config.data() );
+    unsigned long changed = 0;
+    changed |= KDecorationOptions::updateSettings( _config.data() ); // read decoration settings
 
     KConfigGroup config( _config, "Windows" );
     moveMode = stringToMoveResizeMode( config.readEntry("MoveMode", "Opaque" ));
@@ -229,8 +229,12 @@ void Options::reloadCompositingSettings()
 
     // Compositing settings
     CompositingPrefs prefs;
-    prefs.detect();
-    useCompositing = config.readEntry("Enabled", prefs.enableCompositing());
+    useCompositing = config.readEntry("Enabled", true);
+    if (useCompositing)
+    {
+        prefs.detect();
+        useCompositing = prefs.enableCompositing();
+    }
     if (!useCompositing)
         return;