yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compositing settings have to be read if compositing is enforced by the environment variable.

Browse source 
BUG: 231851

svn path=/trunk/KDE/kdebase/workspace/; revision=1109536
This commit is contained in:
Martin Gräßlin 2010-03-31 12:29:04 +00:00
parent fefa3a5d2f
commit bf4a2c00d9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
options.cpp
View file

@ -228,7 +228,15 @@ void Options::reloadCompositingSettings()
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;