Merge remote-tracking branch 'origin/master' into 4.3.4

1 files changed, 5 insertions, 2 deletions

diff --git a/src/server/shared/Logging/AppenderFile.cpp b/src/server/shared/Logging/AppenderFile.cpp
index d66771b9055..01a2f34baa7 100644
--- a/src/server/shared/Logging/AppenderFile.cpp
+++ b/src/server/shared/Logging/AppenderFile.cpp
@@ -26,8 +26,8 @@ AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, co
 {
     dynamicName = std::string::npos != filename.find("%u");
     backup = _flags & APPENDER_FLAGS_MAKE_FILE_BACKUP;
-    if (!dynamicName)
-        logfile = OpenFile(_filename, _mode, backup);
+
+    logfile = !dynamicName ? OpenFile(_filename, _mode, backup) : NULL;
 }
 
 AppenderFile::~AppenderFile()
@@ -54,7 +54,10 @@ void AppenderFile::_write(LogMessage& message)
         fflush(logfile);
 
         if (dynamicName)
+        {
             fclose(logfile);
+            logfile = NULL;
+        }
     }
 }