summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:49:12 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:49:12 +0000
commit8254be09141b56a1afeea5150eef679297b4b696 (patch)
treed6193478efe8cc18727d7cb596c8b8bb5a3990a5 /kdesktop/lock
parentb69a4883748e967bfd7564a7a07c0f9d9832397b (diff)
downloadtdebase-8254be09141b56a1afeea5150eef679297b4b696.tar.gz
tdebase-8254be09141b56a1afeea5150eef679297b4b696.zip
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
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/lockprocess.cc5
1 files changed, 5 insertions, 0 deletions
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 );