aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Master.cpp
diff options
context:
space:
mode:
authorleak <leak@bitmx.net>2014-06-22 16:29:49 +0200
committerleak <leak@bitmx.net>2014-06-22 16:29:49 +0200
commitbfcbde1c97971211d2ecdf5c5f8033eb138658d1 (patch)
tree9d32b87a6d4ef9164faaeaf3eeb730cc368c1fe1 /src/server/worldserver/Master.cpp
parentca3327dbed76d7d13b9e2754990b717267700be9 (diff)
Various cleanups and fixes due to feedback
Diffstat (limited to 'src/server/worldserver/Master.cpp')
-rw-r--r--src/server/worldserver/Master.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 32ca89f3c45..765ab0f09a6 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -171,7 +171,7 @@ int Master::Run()
std::thread worldThread(WorldThread);
- std::thread* cliThread = NULL;
+ std::thread* cliThread = nullptr;
#ifdef _WIN32
if (sConfigMgr->GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)