From d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 8 Apr 2015 15:13:08 -0500 Subject: Remove external dcop call and associated thread Fix lockup on lock screen command due to signal race condition (cherry picked from commit e80c2baea0319decdad80c3c98cc7b28a010b0f0) --- kdesktop/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdesktop/main.cc') 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(); -- cgit v1.2.3