diff --git a/include/Nazara/Core/AbstractLogger.hpp b/include/Nazara/Core/AbstractLogger.hpp index d4cd772f5..fbe61c080 100644 --- a/include/Nazara/Core/AbstractLogger.hpp +++ b/include/Nazara/Core/AbstractLogger.hpp @@ -21,7 +21,7 @@ namespace Nz virtual void EnableStdReplication(bool enable) = 0; - virtual bool IsStdReplicationEnabled() = 0; + virtual bool IsStdReplicationEnabled() const = 0; virtual void Write(const String& string) = 0; virtual void WriteError(ErrorType type, const String& error, unsigned int line = 0, const char* file = nullptr, const char* function = nullptr); diff --git a/include/Nazara/Core/FileLogger.hpp b/include/Nazara/Core/FileLogger.hpp index d0e4fe2aa..d7b1d8f14 100644 --- a/include/Nazara/Core/FileLogger.hpp +++ b/include/Nazara/Core/FileLogger.hpp @@ -25,8 +25,8 @@ namespace Nz void EnableTimeLogging(bool enable); void EnableStdReplication(bool enable) override; - bool IsStdReplicationEnabled() override; - bool IsTimeLoggingEnabled(); + bool IsStdReplicationEnabled() const override; + bool IsTimeLoggingEnabled() const; void Write(const String& string) override; void WriteError(ErrorType type, const String& error, unsigned int line = 0, const char* file = nullptr, const char* function = nullptr) override; diff --git a/include/Nazara/Core/StdLogger.hpp b/include/Nazara/Core/StdLogger.hpp index 430b5a7af..16fd0bb47 100644 --- a/include/Nazara/Core/StdLogger.hpp +++ b/include/Nazara/Core/StdLogger.hpp @@ -22,7 +22,7 @@ namespace Nz void EnableStdReplication(bool enable) override; - bool IsStdReplicationEnabled() override; + bool IsStdReplicationEnabled() const override; void Write(const String& string) override; void WriteError(ErrorType type, const String& error, unsigned int line = 0, const char* file = nullptr, const char* function = nullptr) override; diff --git a/src/Nazara/Core/FileLogger.cpp b/src/Nazara/Core/FileLogger.cpp index bac0cb099..78733850b 100644 --- a/src/Nazara/Core/FileLogger.cpp +++ b/src/Nazara/Core/FileLogger.cpp @@ -65,7 +65,7 @@ namespace Nz * \return true If replication is enabled */ - bool FileLogger::IsStdReplicationEnabled() + bool FileLogger::IsStdReplicationEnabled() const { return m_stdReplicationEnabled; } @@ -75,7 +75,7 @@ namespace Nz * \return true If logging of the time is enabled */ - bool FileLogger::IsTimeLoggingEnabled() + bool FileLogger::IsTimeLoggingEnabled() const { return m_timeLoggingEnabled; } diff --git a/src/Nazara/Core/Log.cpp b/src/Nazara/Core/Log.cpp index 9e6b13353..1ff1ea373 100644 --- a/src/Nazara/Core/Log.cpp +++ b/src/Nazara/Core/Log.cpp @@ -111,7 +111,9 @@ namespace Nz bool Log::Initialize() { - SetLogger(new FileLogger()); + if (s_logger == &s_stdLogger) + SetLogger(new FileLogger()); + return true; } diff --git a/src/Nazara/Core/StdLogger.cpp b/src/Nazara/Core/StdLogger.cpp index e38daa077..c8dfc60bb 100644 --- a/src/Nazara/Core/StdLogger.cpp +++ b/src/Nazara/Core/StdLogger.cpp @@ -47,7 +47,7 @@ namespace Nz * \return Always returns true */ - bool StdLogger::IsStdReplicationEnabled() + bool StdLogger::IsStdReplicationEnabled() const { return true; }