[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/workspace/kwin
From:       Martin Gräßlin <kde () martin-graesslin ! com>
Date:       2010-03-31 12:30:43
Message-ID: 20100331123043.DD7DEAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1109537 by graesslin:

Backport rev 1109536:
Compositing settings have to be read if compositing is enforced by the environment variable.
CCBUG: 231851



 M  +9 -1      options.cpp  


--- branches/KDE/4.4/kdebase/workspace/kwin/options.cpp #1109536:1109537
@@ -228,8 +228,16 @@
     KConfigGroup config(_config, "Compositing");
 
     // do not even detect compositing preferences if explicitly disabled
-    if( config.hasKey( "Enabled" ) && !config.readEntry( "Enabled", true ))
+    bool environmentForce = false;
+    if( getenv( "KWIN_COMPOSE" ))
         {
+        // if compositing is enforced by the environment variable, the preferences have to be read
+        const char c = getenv( "KWIN_COMPOSE" )[ 0 ];
+        if( c == 'X' || c == 'O' )
+            environmentForce = true;
+        }
+    if( config.hasKey( "Enabled" ) && !config.readEntry( "Enabled", true ) && !environmentForce )
+        {
         useCompositing = false;
         return;
         }
[prev in list] [next in list] [prev in thread] [next in thread]