From bfcbde1c97971211d2ecdf5c5f8033eb138658d1 Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Sun, 22 Jun 2014 16:29:49 +0200
Subject: Various cleanups and fixes due to feedback

---
 src/server/worldserver/Master.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/worldserver')

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*/)
-- 
cgit v1.2.3