From 8254be09141b56a1afeea5150eef679297b4b696 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 10 Oct 2011 20:49:12 +0000
Subject: Fix a potential kdesktop_lock malfunction whereby the user would not
 be presented with the login screen

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1258267 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdesktop/lock/lockprocess.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'kdesktop/lock/lockprocess.cc')

diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 6347f00b5..e85ed0dbb 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -1515,6 +1515,11 @@ bool LockProcess::checkPass()
         if (mAutoLogout)
             killTimer(mAutoLogoutTimerId);
 
+        // Make sure we never launch the SAK or login dialog if windows are being closed down
+        // Otherwise we can get stuck in an irrecoverable state where any attempt to show the login screen is instantly aborted
+        if (trinity_desktop_lock_closing_windows)
+            return 0;
+
         if (trinity_desktop_lock_use_sak) {
             // Wait for SAK press before continuing...
             SAKDlg inDlg( this );
-- 
cgit v1.2.1