diff options
author | Timothy Pearson <[email protected]> | 2015-04-08 15:13:08 -0500 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2015-04-14 02:27:23 +0200 |
commit | d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9 (patch) | |
tree | 20979d92829808e36d5ff17557a301a8f2486da7 /kdesktop/lock/lockprocess.cc | |
parent | 15e069f3e078dd97e7cc99a66b77b2647a82c53d (diff) | |
download | tdebase-d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9.tar.gz tdebase-d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9.zip |
Remove external dcop call and associated thread
Fix lockup on lock screen command due to signal race condition
(cherry picked from commit e80c2baea0319decdad80c3c98cc7b28a010b0f0)
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
-rw-r--r-- | kdesktop/lock/lockprocess.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 9612f5cca..4e3922a68 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -981,8 +981,6 @@ void LockProcess::createSaverWindow() } } - fullyOnline(); - kdDebug(1204) << "Saver window Id: " << winId() << endl; } @@ -1319,6 +1317,7 @@ void LockProcess::saverReadyIfNeeded() // Make sure the desktop is hidden before notifying the desktop that the saver is running m_notifyReadyRequested = false; saverReady(); + fullyOnline(); } } @@ -1405,6 +1404,7 @@ bool LockProcess::startSaver(bool notify_ready) } } } + return true; } |