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
13 years ago · 2b7f7b5e4c
parent bbd15b6d4c
commit 2b7f7b5e4c
2 changed files with 7 additions and 1 deletions
--- 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;
 }

--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@ -516,7 +516,8 @@ void KSMShutdownFeedback::slotPaintEffect()
 KSMShutdownIPFeedback * KSMShutdownIPFeedback::s_pSelf = 0L;

 KSMShutdownIPFeedback::KSMShutdownIPFeedback()
- : TQWidget( 0L, "feedbackipwidget", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+// : TQWidget( 0L, "feedbackipwidget", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+ : TQWidget( 0L, "feedbackipwidget", Qt::WStyle_Customize | Qt::WStyle_Dialog | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)

 {
 	m_sharedRootPixmap = new KRootPixmap(this);