Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 30d204aa48596a7871a133beca82b714ec505b24..d05ece8a45ac2c7f86bce4308dbb3fcc598687c9 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -27,11 +27,15 @@
 
 void InspIRCd::SignalHandler(int signal)
 {
+#ifdef _WIN32
+       if (signal == SIGTERM)
+#else
        if (signal == SIGHUP)
        {
                Rehash("Caught SIGHUP");
        }
        else if (signal == SIGTERM)
+#endif
        {
                Exit(signal);
        }
@@ -39,18 +43,13 @@ void InspIRCd::SignalHandler(int signal)
 
 void InspIRCd::Exit(int status)
 {
-#ifdef WINDOWS
-       if (WindowsIPC)
-               delete WindowsIPC;
+#ifdef _WIN32
        SetServiceStopped(status);
 #endif
-       if (this)
-       {
-               this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
-               this->Cleanup();
-               delete this;
-               ServerInstance = NULL;
-       }
+       this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
+       this->Cleanup();
+       delete this;
+       ServerInstance = NULL;
        exit (status);
 }