vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bah, do this properly. Avoid detecting compositing prefs only 

if compositing is explicitly disabled. This allows disabling
it if there's a problem, and in that case the prefs don't matter
anyway, but it doesn't prevent detecting details about compositing
when it might be used.


svn path=/trunk/KDE/kdebase/workspace/; revision=1058282
icc-effect-5.14.5
Luboš Luňák 2009-12-04 09:40:12 +00:00
parent 7cef1eadd5
commit bbd4deffe8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
options.cpp
View File

@ -227,17 +227,16 @@ void Options::reloadCompositingSettings()
KSharedConfig::Ptr _config = KGlobal::config();
KConfigGroup config(_config, "Compositing");
// do not even detect compositing preferences if explicitly disabled
if( config.hasKey( "Enabled" ) && !config.readEntry( "Enabled", true ))
{
useCompositing = false;
return;
}
// Compositing settings
CompositingPrefs prefs;
if( !config.hasKey( "Enabled" ))
{
prefs.detect();
useCompositing = prefs.recommendCompositing();
}
else
useCompositing = config.readEntry( "Enabled" , true );
if (!useCompositing)
return;
prefs.detect();
useCompositing = config.readEntry( "Enabled" , prefs.recommendCompositing());
QString compositingBackend = config.readEntry("Backend", "OpenGL");
if( compositingBackend == "XRender" )