*Properly initialize members to prevent DB logging before the DB is started. Fixes a rarely seen startup crash.

*Code cleanup.

--HG--
branch : trunk

2 files changed, 4 insertions, 3 deletions

diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 73924b485ce..379388d7997 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -39,7 +39,7 @@
 
 size_t Database::db_count = 0;
 
-Database::Database()
+Database::Database() : mMysql(NULL) 
 {
     // before first connection
     if (db_count++ == 0)
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index d35b25a9069..187b9eaa79b 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -31,8 +31,9 @@ INSTANTIATE_SINGLETON_1( Log );
 
 Log::Log() :
     raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
-    dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false), m_colored(false)
-    , arenaLogFile(NULL)
+    dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false), 
+    m_enableLogDBLater(false), m_enableLogDB(false), m_colored(false),
+    arenaLogFile(NULL)
 {
     Initialize();
 }