diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-11 14:56:34 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-11 14:56:34 -0600 |
| commit | 3e5e79fb21c58824c14eafc864c2ba4f19951529 (patch) | |
| tree | f69e5768dea46c7e96b5d8d9eeee4b6c097b987f /kdesktop | |
| parent | a35fdc9c4df20c017653edfaa77465dfe85d38d6 (diff) | |
| download | tdebase-3e5e79fb21c58824c14eafc864c2ba4f19951529.tar.gz tdebase-3e5e79fb21c58824c14eafc864c2ba4f19951529.zip | |
Prevent two unlock dialogs from appearing in any situation
Diffstat (limited to 'kdesktop')
| -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 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 |