From cbbc7ad02e978c5f2cb1e90338eab65996bc554e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 26 Oct 2013 15:21:12 +0200
Subject: Fix getting kdesktop_pid in kdesktop_lock

This fixes sending a signal on fully activation to kdesktop
SaverEngine. This fixes setting Saving state in SaverEngine.
This fixes hang in processing kdesktop lock dcop call during
the switch to suspend modes when the screen saver is active.
---
 kdesktop/lock/main.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kdesktop/lock/main.cc')

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 497a602ff..ba42318c0 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -370,6 +370,7 @@ int main( int argc, char **argv )
         app.processEvents();
 
         if (args->isSet( "internal" )) {
+            kdesktop_pid = atoi(args->getOption( "internal" ));
             while (signalled_run == FALSE) {
                 sigset_t new_mask;
                 struct sigaction act;
@@ -483,7 +484,6 @@ int main( int argc, char **argv )
             return ret;
         }
         else {
-            kdesktop_pid = atoi(args->getOption( "internal" ));
             if (kill(kdesktop_pid, 0) < 0) {
                 // The controlling kdesktop process probably died.  Commit suicide...
                 return 12;
-- 
cgit v1.2.1