summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-06-06 20:05:30 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-06-06 20:12:21 +0200
commita13e78ad711f858ca92b64c4ef9a72631153fa4a (patch)
treecebbb4a4c4b9668805823efdbd007fa29ec02656
parente234e073f7b1b7ea730d638f2576056a82bf01fd (diff)
downloadtdebase-a13e78ad711f858ca92b64c4ef9a72631153fa4a.tar.gz
tdebase-a13e78ad711f858ca92b64c4ef9a72631153fa4a.zip
Fix displaying of logout status dialog with manually triggered save session
This closes Bug 922 (cherry picked from commit 5c3cd105bf9a3f6a1089e18e5edbe2b4ebff68a1)
-rw-r--r--ksmserver/shutdown.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 318718774..e2e2d7cb1 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -495,7 +495,7 @@ void KSMServer::completeShutdownOrCheckpoint()
return;
bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);
- if (showFancyLogout) {
+ if (showFancyLogout && state != Checkpoint) {
KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
while (!KSMShutdownIPFeedback::ispainted()) {