From 2b7f7b5e4cd685f07c849880515f8c828eae1a34 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 8 Oct 2011 04:31:31 +0000
Subject: Fix failure to resume from suspend/hibernate or simply clicking the
 Cancel button on the shutdown screen...

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1257818 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ksmserver/shutdown.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ksmserver/shutdown.cpp')

diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 4473c670b..a4ca020e6 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -251,6 +251,11 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
         if ( clients.isEmpty() )
             completeShutdownOrCheckpoint();
     }
+    else {
+        if (showFancyLogout) {
+            KSMShutdownIPFeedback::stop();
+        }
+    }
     dialogActive = false;
 }
 
-- 
cgit v1.2.3