Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/src/server.cpp b/src/server.cpp
index 4bd81a6d1ba970bd09b3f4b24d5fd64bc6d64998..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);
 }
 
@@ -70,9 +69,12 @@ std::string InspIRCd::GetVersionString(bool operstring)
 {
        char versiondata[MAXBUF];
        if (operstring)
-               snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION,Config->ServerName.c_str(),SYSTEM,REVISION,SE->GetName().c_str(),Config->sid.c_str());
+       {
+               std::string sename = SE->GetName();
+               snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION, Config->ServerName.c_str(), SYSTEM,REVISION, sename.c_str(), Config->sid.c_str());
+       }
        else
-               snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str());
+               snprintf(versiondata,MAXBUF,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str());
        return versiondata;
 }