X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=process.cpp;fp=process.cpp;h=62a46af9574f12fd4124bd74ef4965924363222f;hb=76673b917b29d2a0206062f4bc132ae6e043b0d2;hp=d1a9a4982395117e1caf6f1875b52dfa4a9d7733;hpb=04056eb6ead840b893772711f5a8db10f8ba76c1;p=nssm.git

diff --git a/process.cpp b/process.cpp
index d1a9a49..62a46af 100644
--- a/process.cpp
+++ b/process.cpp
@@ -241,7 +241,8 @@ int kill_console(nssm_service_t *service, kill_t *k) {
 
   /* Ignore the event ourselves. */
   ret = 0;
-  if (! SetConsoleCtrlHandler(0, TRUE)) {
+  bool ignored = SetConsoleCtrlHandler(0, TRUE);
+  if (! ignored) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETCONSOLECTRLHANDLER_FAILED, k->name, error_string(GetLastError()), 0);
     ret = 4;
   }
@@ -262,6 +263,11 @@ int kill_console(nssm_service_t *service, kill_t *k) {
   /* Wait for process to exit. */
   if (await_single_handle(k->status_handle, k->status, k->process_handle, k->name, _T(__FUNCTION__), k->kill_console_delay)) ret = 6;
 
+  /* Remove our handler. */
+  if (ignored && ! SetConsoleCtrlHandler(0, FALSE)) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETCONSOLECTRLHANDLER_FAILED, k->name, error_string(GetLastError()), 0);
+  }
+
   return ret;
 }