summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockprocess.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-04-23 14:59:01 -0500
committerTimothy Pearson <[email protected]>2012-04-23 14:59:01 -0500
commit67a3a8f34892a6491ba0073a3f583503b44e58e7 (patch)
tree7f3c81b5f0c6b65e0e00711831211c1475af9241 /kdesktop/lock/lockprocess.cc
parente72f4926c094b2bd94501518fbcd2a3e66a74f6a (diff)
downloadtdebase-67a3a8f34892a6491ba0073a3f583503b44e58e7.tar.gz
tdebase-67a3a8f34892a6491ba0073a3f583503b44e58e7.zip
Fix desktop lock failure due to race condition within signal handler between qt and xcb
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
-rw-r--r--kdesktop/lock/lockprocess.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index c0050d308..3c67ac06d 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
}