# HG changeset patch
# User jbe
# Date 1496764699 -7200
# Node ID 99ebca235c951a09874d22708ced1d6329ce32db
# Parent  d4fdc4ed4d813e438f3bfe144fe7e04f98ba4a4c
Undo last commit (Avoid duplicate shutdown)

diff -r d4fdc4ed4d81 -r 99ebca235c95 moonbridge.c
--- a/moonbridge.c	Tue Jun 06 17:56:00 2017 +0200
+++ b/moonbridge.c	Tue Jun 06 17:58:19 2017 +0200
@@ -1154,7 +1154,6 @@
       moonbr_log(LOG_WARNING, "Error while sending SIGTERM to own process group: %s", strerror(errno));
     }
   }
-  moonbr_cond_terminate = 0;  /* ignore SIGTERM received by killpg() */
 }
 
 
@@ -1554,7 +1553,10 @@
       moonbr_log(LOG_WARNING, "Fast shutdown requested");
       moonbr_terminate(MOONBR_EXITCODE_GRACEFUL);
     }
-    if (moonbr_cond_terminate) moonbr_initiate_shutdown();
+    if (moonbr_cond_terminate) {
+      moonbr_initiate_shutdown();
+      moonbr_cond_terminate = 0;
+    }
     moonbr_cond_child = 0;  /* must not be reset between moonbr_try_destroy_worker() and poll() */
     moonbr_now(&now);
     for (pool=moonbr_first_pool; pool; pool=pool->next_pool) {