diff options
| author | Timothy Pearson <[email protected]> | 2012-04-27 03:19:38 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-03 03:27:16 +0200 |
| commit | 33f1ecab8492e686c4bd736419ca1ae33e2c6eea (patch) | |
| tree | 84b34fd2784343dc19dae754a52ef5751fc54690 /kdesktop/lock/lockprocess.cc | |
| parent | 9c17452032ed5e886f29c18c32898beb23c65d95 (diff) | |
| download | tdebase-33f1ecab8492e686c4bd736419ca1ae33e2c6eea.tar.gz tdebase-33f1ecab8492e686c4bd736419ca1ae33e2c6eea.zip | |
Harden lock against rare race condition that caused two password prompts to appear
Provide alternate secure dialog text string when username cannot be obtained
(cherry picked from commit e899b7beb6b0f2db8c08dfdc14c29efb99046086)
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 3fb068b6f..80616b79c 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -1542,6 +1542,7 @@ void LockProcess::displayLockDialogIfNeeded() mBusy = true; if (mLocked) { if (checkPass()) { + trinity_desktop_lock_closing_windows = true; stopSaver(); kapp->quit(); } @@ -1882,6 +1883,7 @@ bool LockProcess::x11Event(XEvent *event) else { if (!mLocked || checkPass()) { + trinity_desktop_lock_closing_windows = true; stopSaver(); kapp->quit(); } |