From ecbb9134a5e4c631fc10cb9251d0d18de80d6b36 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 2 Feb 2014 20:10:02 +0000 Subject: Revert "Properly initialised variables" This reverts commit 02e752789399ad1b65a0443534ea6a8721efd78c. --- src/MCLogger.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/MCLogger.cpp') diff --git a/src/MCLogger.cpp b/src/MCLogger.cpp index b7b826374..aebe3e1c9 100644 --- a/src/MCLogger.cpp +++ b/src/MCLogger.cpp @@ -11,6 +11,10 @@ cMCLogger * cMCLogger::s_MCLogger = NULL; bool g_ShouldColorOutput = false; +/** Flag to show whether a 'replace line' log command has been issued +Used to decide when to put a newline */ +bool g_BeginLineUpdate = false; + #ifdef _WIN32 #include // Needed for _isatty(), not available on Linux @@ -34,7 +38,6 @@ cMCLogger * cMCLogger::GetInstance(void) cMCLogger::cMCLogger(void) - : m_BeginLineUpdate(false) { AString FileName; Printf(FileName, "LOG_%d.txt", (int)time(NULL)); @@ -46,7 +49,6 @@ cMCLogger::cMCLogger(void) cMCLogger::cMCLogger(const AString & a_FileName) - : m_BeginLineUpdate(false) { InitLog(a_FileName); } @@ -125,14 +127,14 @@ void cMCLogger::Log(const char * a_Format, va_list a_ArgList, bool a_ShouldRepla { cCSLock Lock(m_CriticalSection); - if (!m_BeginLineUpdate && a_ShouldReplaceLine) + if (!g_BeginLineUpdate && a_ShouldReplaceLine) { a_ShouldReplaceLine = false; // Print a normal line first if this is the initial replace line - m_BeginLineUpdate = true; + g_BeginLineUpdate = true; } - else if (m_BeginLineUpdate && !a_ShouldReplaceLine) + else if (g_BeginLineUpdate && !a_ShouldReplaceLine) { - m_BeginLineUpdate = false; + g_BeginLineUpdate = false; } if (a_ShouldReplaceLine) -- cgit v1.2.3