From 3416a6543d996aa0dda1f9cb5f9d4e4570a7fbb6 Mon Sep 17 00:00:00 2001 From: maximius Date: Sat, 26 Sep 2009 12:41:46 -0700 Subject: *Wintergrasp: Tenacity fixes by Spp *Better Windows signal handling for services, by defacer *Always hide triggers for players, by ogeraisi --HG-- branch : trunk --- src/trinitycore/Master.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/trinitycore/Master.cpp') diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 94c5a4cc023..c50381d7a2d 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -521,7 +521,8 @@ void Master::_OnSignal(int s) break; case SIGTERM: #ifdef _WIN32 - case SIGBREAK: + if (m_ServiceStatus != 1) + case SIGBREAK: #endif World::StopNow(SHUTDOWN_EXIT_CODE); break; @@ -536,7 +537,8 @@ void Master::_HookSignals() signal(SIGINT, _OnSignal); signal(SIGTERM, _OnSignal); #ifdef _WIN32 - signal(SIGBREAK, _OnSignal); + if (m_ServiceStatus != 1) + signal(SIGBREAK, _OnSignal); #endif } -- cgit v1.2.3