diff options
Diffstat (limited to 'twin')
| -rw-r--r-- | twin/kompmgr/kompmgr.c | 5 | ||||
| -rw-r--r-- | twin/workspace.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c index 55c1bebd1..d94b7aa11 100644 --- a/twin/kompmgr/kompmgr.c +++ b/twin/kompmgr/kompmgr.c @@ -441,8 +441,9 @@ void handle_siguser (int sig) { int uidnum; if (sig == SIGTERM) { - // Trap this signal and keep running... - return; + my_exit_code=0; + delete_pid_file(); + exit(0); } if (sig == SIGUSR1) { char newuid[1024]; diff --git a/twin/workspace.cpp b/twin/workspace.cpp index f55561ac6..fe088af54 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -230,7 +230,7 @@ Workspace::Workspace( bool restore ) *kompmgr << "kompmgr"; startKompmgr(); } - else + else if (!disable_twin_composition_manager) { // If kompmgr is already running, send it SIGTERM // Attempt to load the kompmgr pid file |