diff options
| author | Timothy Pearson <[email protected]> | 2015-04-13 15:05:11 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-04-14 02:27:31 +0200 |
| commit | 3b139d2a1e47f5585bfabd47ca891e9b4c5e53d9 (patch) | |
| tree | 3b82bbff9fc80323b988737eba757a2088a8d6c0 /kdesktop/lock | |
| parent | f853f4bd46b5b3b00840afdcf826149e5661e678 (diff) | |
| download | tdebase-3b139d2a1e47f5585bfabd47ca891e9b4c5e53d9.tar.gz tdebase-3b139d2a1e47f5585bfabd47ca891e9b4c5e53d9.zip | |
Do not unblock signals in main thread when waiting for kdesktop_lock response
This prevents incorrect cancellation of internal xcb poll() methods and subsequent deadlock
(cherry picked from commit ab8dfbaaa482e8de7ebd3a5eec1065b38d5299f6)
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 85de4e0e1..37d2b8867 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2092,7 +2092,6 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm) setGeometry(0, 0, mRootWidth, mRootHeight); erase(); } -// saverReadyIfNeeded(); } void LockProcess::preparePopup() |