FMR bug

diff --git a/src/helper.cc b/src/helper.cc
index 3e07dbcfad5bcd5ab429b211a59bb1cf9312f7b7..6ff48935a544f9e808c4bb1d7fe575f19212cbd8 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -191,15 +191,15 @@ helperStateFree(int fd, void *data)
     if (srv->wfd != srv->rfd)
        comm_close(srv->wfd);
     dlinkDelete(&srv->link, &hlp->servers);
-    cbdataFree(srv);
     hlp->n_running--;
     assert(hlp->n_running >= 0);
-    if (shutting_down || reconfiguring)
-       return;
-    debug(34, 0) ("WARNING: %s #%d (FD %d) exited\n",
-       hlp->id_name, srv->index + 1, fd);
-    if (hlp->n_running < hlp->n_to_start / 2)
-       fatalf("Too few %s processes are running", hlp->id_name);
+    if (!shutting_down && !reconfiguring) {
+        debug(34, 0) ("WARNING: %s #%d (FD %d) exited\n",
+           hlp->id_name, srv->index + 1, fd);
+        if (hlp->n_running < hlp->n_to_start / 2)
+           fatalf("Too few %s processes are running", hlp->id_name);
+    }
+    cbdataFree(srv);
 }
 
 static void