Fix kompmgr not respecting user settings

11 years ago · ed123019ba
parent 864059732e
commit ed123019ba
2 changed files with 4 additions and 3 deletions
--- 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];
--- 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