* Merge.

--HG--
branch : trunk

3 files changed, 13 insertions, 0 deletions

diff --git a/src/game/World.cpp b/src/game/World.cpp
index ef1935f84a7..d9a22a4a4a2 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1546,6 +1546,7 @@ void World::SetInitialWorldSettings()
     }
     else
     {
+        sLog.SetLogDB(false);
         sLog.SetLogDBLater(false);
     }
 
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index 62446c4106c..a478f18daa9 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -464,8 +464,14 @@ bool Master::_StartDB()
     {
         // everything successful - set var to enable DB logging once startup finished.
         sLog.SetLogDBLater(true);
+        sLog.SetLogDB(false);
         sLog.SetRealmID(realmID);
     }
+    else
+    {
+        sLog.SetLogDBLater(false);
+        sLog.SetLogDB(false);
+    }
 
     ///- Clean the database before starting
     clearOnlineAccounts();
diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp
index bd318779f83..65596e35b21 100644
--- a/src/trinityrealm/Main.cpp
+++ b/src/trinityrealm/Main.cpp
@@ -187,6 +187,7 @@ extern int main(int argc, char **argv)
     {
         // everything successful - set var to enable DB logging once startup finished.
         sLog.SetLogDBLater(true);
+        sLog.SetLogDB(false);
         // ensure we've set realm to 0 (realmd realmid)
         sLog.SetRealmID(0);
     }
@@ -271,6 +272,11 @@ extern int main(int argc, char **argv)
         // login db needs thread for logging
         sLog.SetLogDB(true);
     }
+    else
+    {
+        sLog.SetLogDB(false);
+        sLog.SetLogDBLater(false);
+    }
 
     ///- Wait for termination signal
     while (!stopEvent)