diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-10-26 15:21:12 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-10-26 15:21:12 +0200 |
| commit | cbbc7ad02e978c5f2cb1e90338eab65996bc554e (patch) | |
| tree | af017fe7f90e3a062e5991a52993270569a025a7 /kdesktop/lock/main.cc | |
| parent | 4e5c2c20528c0540545a87d08ebd6a3b798c8e3b (diff) | |
| download | tdebase-cbbc7ad02e978c5f2cb1e90338eab65996bc554e.tar.gz tdebase-cbbc7ad02e978c5f2cb1e90338eab65996bc554e.zip | |
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.
Diffstat (limited to 'kdesktop/lock/main.cc')
| -rw-r--r-- | kdesktop/lock/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |