From 1bd1c6586c658d3aa7195c34eaf009c61ffa7e73 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 23 Apr 2012 14:59:01 -0500 Subject: Fix desktop lock failure due to race condition within signal handler between qt and xcb (cherry picked from commit 67a3a8f34892a6491ba0073a3f583503b44e58e7) --- kdesktop/lock/lockprocess.cc | 2 ++ kdesktop/lock/main.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'kdesktop/lock') diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index f3f1e6cfe..0981d2a50 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -664,6 +664,7 @@ void LockProcess::startSecureDialog() } trinity_desktop_lock_in_sec_dlg = false; if (ret == 0) { + trinity_desktop_lock_closing_windows = 1; kapp->quit(); } if (ret == 1) { @@ -687,6 +688,7 @@ void LockProcess::startSecureDialog() mBusy = false; } if (ret == 2) { + trinity_desktop_lock_closing_windows = 1; if (system("ksysguard &") == -1) { // Error handler to shut up gcc warnings } diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 658472c22..89dc1917c 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -266,7 +266,7 @@ int main( int argc, char **argv ) bool rt; bool sig = false; - if( (!child && (args->isSet( "forcelock" )) || (signalled_forcelock == TRUE))) { + if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE))) { rt = process.lock(); sig = true; } -- cgit v1.2.3