diff options
| author | Timothy Pearson <[email protected]> | 2013-06-11 16:18:46 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-06-11 16:46:10 -0500 |
| commit | ed123019baadb34c9507ebe0bf347ecd679d994b (patch) | |
| tree | 86cbd6bb92115e9f6b1b5699a057ad5c4078d8e6 | |
| parent | 864059732e6d5147c1d241c40667e1e2f4a16465 (diff) | |
| download | tdebase-ed123019baadb34c9507ebe0bf347ecd679d994b.tar.gz tdebase-ed123019baadb34c9507ebe0bf347ecd679d994b.zip | |
Fix kompmgr not respecting user settings
| -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 |