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

Possible fix for corrupting KWin settings on some systems.

Browse source 
Also fixed setting revert message to only display when actually
reverting.

svn path=/trunk/KDE/kdebase/workspace/; revision=890193
This commit is contained in:
Lucas Murray 2008-11-28 14:57:22 +00:00
parent 09061ebbe9
commit eca9561ab7
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwincompositing/main.cpp
View file

@ -855,6 +855,7 @@ void KWinCompositingConfig::copyPluginsToTmpConfig()
KConfigGroup newGroup( mNewConfig, "Plugins" );
KConfigGroup tmpGroup( mTmpConfig, "Plugins" );
tmpGroup.deleteGroup();
mTmpConfig->sync();
newGroup.copyTo( &tmpGroup );
}
@ -863,6 +864,7 @@ void KWinCompositingConfig::copyPluginsToNewConfig()
KConfigGroup newGroup( mNewConfig, "Plugins" );
KConfigGroup tmpGroup( mTmpConfig, "Plugins" );
newGroup.deleteGroup();
mNewConfig->sync();
tmpGroup.copyTo( &newGroup );
}

6
options.cpp
View file

@ -51,9 +51,9 @@ Options::Options()
// If there is any contents in the backup file, it means that KWin crashed
// while testing a new config. Revert the config.
// TODO: Notify the user?
bool backupImported = importBackup();
kWarning( 1212, backupImported ) << "The new settings have most likely caused the X server "
"to crash. The configuration options have been reverted to their old values.";
if( importBackup() )
kWarning( 1212 ) << "The new settings have most likely caused the X server "
"to crash. The configuration options have been reverted to their old values.";
updateSettings();
}