diff options
| -rw-r--r-- | src/trinitycore/Master.cpp | 4 | ||||
| -rw-r--r-- | src/trinityrealm/Main.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index fee1b9be71c..7e56cb7a636 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -521,9 +521,9 @@ void Master::_OnSignal(int s) break; case SIGTERM: #ifdef _WIN32 - case SIGBREAK: - #endif + case SIGBREAK: if (m_ServiceStatus != 1) + #endif World::StopNow(SHUTDOWN_EXIT_CODE); break; } diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp index 96c1abe5c28..d51600b3e40 100644 --- a/src/trinityrealm/Main.cpp +++ b/src/trinityrealm/Main.cpp @@ -335,14 +335,12 @@ void OnSignal(int s) { case SIGINT: case SIGTERM: - stopEvent = true; - break; #ifdef _WIN32 case SIGBREAK: if (m_ServiceStatus != 1) + #endif stopEvent = true; break; - #endif } signal(s, OnSignal); @@ -375,7 +373,7 @@ void HookSignals() signal(SIGTERM, OnSignal); #ifdef _WIN32 if (m_ServiceStatus != 1) - signal(SIGBREAK, OnSignal); + signal(SIGBREAK, OnSignal); #endif } @@ -386,7 +384,7 @@ void UnhookSignals() signal(SIGTERM, 0); #ifdef _WIN32 if (m_ServiceStatus != 1) - signal(SIGBREAK, 0); + signal(SIGBREAK, 0); #endif } |