diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-11 14:56:34 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-01-17 20:43:13 +0100 |
| commit | cd375d8c7c5bfd1e31596557df0cb068849d9565 (patch) | |
| tree | 3df88653453aa653fb81ea9df7ab3e82f58a3842 | |
| parent | 75ec507bc339e593fc8b0f400f6a8e07743ce600 (diff) | |
| download | tdebase-cd375d8c7c5bfd1e31596557df0cb068849d9565.tar.gz tdebase-cd375d8c7c5bfd1e31596557df0cb068849d9565.zip | |
Prevent two unlock dialogs from appearing in any situation
(cherry picked from commit 3e5e79fb21c58824c14eafc864c2ba4f19951529)
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index e9b85bf10..bf8cf998f 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 |