From 3e5e79fb21c58824c14eafc864c2ba4f19951529 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 11 Jan 2013 14:56:34 -0600 Subject: [PATCH] Prevent two unlock dialogs from appearing in any situation --- kdesktop/lock/lockprocess.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 70836c26c..026c32272 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -1769,9 +1769,15 @@ void LockProcess::resume( bool force ) // bool LockProcess::checkPass() { + if (!mDialogs.isEmpty()) { + // Another dialog is already shown + // Abort! + return 0; + } if (mInfoMessageDisplayed == false) { - if (mAutoLogout) + 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