diff options
| author | Timothy Pearson <[email protected]> | 2012-04-27 03:19:38 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-04-27 03:19:38 -0500 |
| commit | e899b7beb6b0f2db8c08dfdc14c29efb99046086 (patch) | |
| tree | 76b9346919e552892bc28d83993501e4d4a992fa /kdesktop/lock/lockprocess.cc | |
| parent | 601b75a1e4158dbf0c293e682d5db0078a41e736 (diff) | |
| download | tdebase-e899b7beb6b0f2db8c08dfdc14c29efb99046086.tar.gz tdebase-e899b7beb6b0f2db8c08dfdc14c29efb99046086.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
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 f1426194e..2b47661db 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(); } |