* Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

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)