summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-20 18:22:04 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:27:30 +0200
commitb16a917f80d6d5b98627dd179f02d734ee71ffa6 (patch)
tree1651ff2dfaedba37513258681a0518c0e016f48f /kdesktop/lock
parent79c512a168677b441ee6141d5dbe6b0a9d778386 (diff)
downloadtdebase-b16a917f80d6d5b98627dd179f02d734ee71ffa6.tar.gz
tdebase-b16a917f80d6d5b98627dd179f02d734ee71ffa6.zip
Fix desktop lock not engaging on suspend
This closes Bug 1003 (cherry picked from commit 193d9afcdb186902317c5bef5d6c769fc8933f1a)
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/main.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index ee7997cd5..2b590c118 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -331,6 +331,10 @@ int main( int argc, char **argv )
}
else {
pid_t kdesktop_pid = atoi(args->getOption( "internal" ));
+ if (kill(kdesktop_pid, SIGUSR2) < 0) {
+ // The controlling kdesktop process probably died. Commit suicide...
+ return 12;
+ }
app.exec();
if (kill(kdesktop_pid, SIGUSR1) < 0) {
// The controlling kdesktop process probably died. Commit suicide...