From e32cb43aa5b20603a0301cebd1f0214f2405059e Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 8 Jun 2015 14:17:59 -0400 Subject: A couple quick adjustments to the LSession: 1) Ensure that the settings file never has the saved version go "backwards", only forward so that we know what version the settings correspond with. 2) Have the WM reset wait a second before starting off (X is sometimes still swamped when the event happens - give it a moment first). --- lumina-desktop/LSession.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lumina-desktop/LSession.cpp') diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index b61e32af..9a292438 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -406,7 +406,9 @@ void LSession::checkUserFiles(){ //Save the current version of the session to the settings file (for next time) - sessionsettings->setValue("DesktopVersion", this->applicationVersion()); + if(newversion || newrelease){ + sessionsettings->setValue("DesktopVersion", this->applicationVersion()); + } } void LSession::refreshWindowManager(){ @@ -449,7 +451,7 @@ void LSession::updateDesktops(){ //QTimer::singleShot(0,DESKTOPS[i], SLOT(checkResolution())); } } - WM->restartWM(); //Make sure fluxbox also gets prompted to re-load screen config + QTimer::singleShot(1000,WM, SLOT(restartWM())); //Make sure fluxbox also gets prompted to re-load screen config } //Make sure all the background windows are registered on the system as virtual roots QTimer::singleShot(100,this, SLOT(registerDesktopWindows())); -- cgit