Possible fix for corrupting KWin settings on some systems.
Also fixed setting revert message to only display when actually reverting. svn path=/trunk/KDE/kdebase/workspace/; revision=890193icc-effect-5.14.5
parent
09061ebbe9
commit
eca9561ab7
|
@ -855,6 +855,7 @@ void KWinCompositingConfig::copyPluginsToTmpConfig()
|
||||||
KConfigGroup newGroup( mNewConfig, "Plugins" );
|
KConfigGroup newGroup( mNewConfig, "Plugins" );
|
||||||
KConfigGroup tmpGroup( mTmpConfig, "Plugins" );
|
KConfigGroup tmpGroup( mTmpConfig, "Plugins" );
|
||||||
tmpGroup.deleteGroup();
|
tmpGroup.deleteGroup();
|
||||||
|
mTmpConfig->sync();
|
||||||
newGroup.copyTo( &tmpGroup );
|
newGroup.copyTo( &tmpGroup );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -863,6 +864,7 @@ void KWinCompositingConfig::copyPluginsToNewConfig()
|
||||||
KConfigGroup newGroup( mNewConfig, "Plugins" );
|
KConfigGroup newGroup( mNewConfig, "Plugins" );
|
||||||
KConfigGroup tmpGroup( mTmpConfig, "Plugins" );
|
KConfigGroup tmpGroup( mTmpConfig, "Plugins" );
|
||||||
newGroup.deleteGroup();
|
newGroup.deleteGroup();
|
||||||
|
mNewConfig->sync();
|
||||||
tmpGroup.copyTo( &newGroup );
|
tmpGroup.copyTo( &newGroup );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,9 +51,9 @@ Options::Options()
|
||||||
// If there is any contents in the backup file, it means that KWin crashed
|
// If there is any contents in the backup file, it means that KWin crashed
|
||||||
// while testing a new config. Revert the config.
|
// while testing a new config. Revert the config.
|
||||||
// TODO: Notify the user?
|
// TODO: Notify the user?
|
||||||
bool backupImported = importBackup();
|
if( importBackup() )
|
||||||
kWarning( 1212, backupImported ) << "The new settings have most likely caused the X server "
|
kWarning( 1212 ) << "The new settings have most likely caused the X server "
|
||||||
"to crash. The configuration options have been reverted to their old values.";
|
"to crash. The configuration options have been reverted to their old values.";
|
||||||
|
|
||||||
updateSettings();
|
updateSettings();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue