From 3b707063bfd60683b0378f7b9cb1bfd24b2bed03 Mon Sep 17 00:00:00 2001 From: Matthias Ettrich Date: Sun, 16 Jul 2000 19:09:09 +0000 Subject: [PATCH] removed workaround for qt-2.1b3 svn path=/trunk/kdebase/ksmserver/; revision=57371 --- main.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/main.cpp b/main.cpp index 8be14ae5dd..8772da1a60 100644 --- a/main.cpp +++ b/main.cpp @@ -167,7 +167,7 @@ void Application::commitData( QSessionManager& /*sm*/ ) void Application::saveState( QSessionManager& sm ) { KApplication::saveState( sm ); - static bool firstTime = false; + static bool firstTime = true; if ( firstTime ) { firstTime = false; return; // no need to save this state. @@ -175,15 +175,11 @@ void Application::saveState( QSessionManager& sm ) sm.release(); - // we really should do phase 2 here, unfortunately qt-2.1beta3 contains a bug. - // #######TODO FIXME with final Qt-2.1 - /* if ( !sm.isPhase2() ) { - sm.requestPhase2(); - return; + sm.requestPhase2(); + return; } - */ - + workspaces.first()->storeSession( kapp->sessionConfig() ); kapp->sessionConfig()->sync(); }