Fix kompmgr not respecting user settings

twin/kompmgr/kompmgr.c

@@ -441,8 +441,9 @@ void handle_siguser (int sig)
 {
     int uidnum;
     if (sig == SIGTERM) {
-        // Trap this signal and keep running...
+        my_exit_code=0;
-        return;
+        delete_pid_file();
+        exit(0);
     }
     if (sig == SIGUSR1) {
         char newuid[1024];

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