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

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
icc-effect-5.14.5
Luboš Luňák 2009-12-04 08:50:13 +00:00
parent 601233bcc1
commit 868e08f380
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
options.cpp
View File

@ -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;