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/main.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/main.cc')
| -rw-r--r-- | kdesktop/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 4228df0c8..b54c03cb7 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -283,7 +283,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) TDESelectionOwner kde_running( "_KDE_RUNNING", 0 ); kde_running.claim( false ); - KDesktop desktop( x_root_hack, wait_for_kded ); + KDesktop desktop( &saver, x_root_hack, wait_for_kded ); args->clear(); |