diff options
| author | Timothy Pearson <[email protected]> | 2013-10-28 14:06:47 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-10-28 14:06:47 -0500 |
| commit | 740cdbc24975f0469962aea07732dddf6aee5b78 (patch) | |
| tree | 52da2c654a5b0cc041f162d6d4f81e3ff886902b /kdesktop/lock/main.cc | |
| parent | a039120e05fd8c03569e1135a30bbbb797e887b2 (diff) | |
| parent | d1324133ee949acedcbf1776c8a80d3e28218c23 (diff) | |
| download | tdebase-740cdbc24975f0469962aea07732dddf6aee5b78.tar.gz tdebase-740cdbc24975f0469962aea07732dddf6aee5b78.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
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; |