Merge branch '2.0' into develop

2016-12-05 21:19:59 +02:00
parent f5eb4e21dc 1a9232b152
commit 4ae85dc754
18 changed files with 215 additions and 55 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -1075,6 +1075,11 @@ bool disable_signals(void)
        return false;
    }

+    if (!delete_signal(&sigset, SIGCHLD, "SIGCHLD"))
+    {
+        return false;
+    }
+
 #ifdef SIGBUS
    if (!delete_signal(&sigset, SIGBUS, "SIGBUS"))
    {