Merge branch 'master' into dev

Source commit: 38b8cda8bf6242d37d0cd34f07a6cb326d3acda7

source/core/SessionInfo.cpp

@@ -1788,7 +1788,10 @@ void TApplicationLog::Enable(const UnicodeString & Path)
 //---------------------------------------------------------------------------
 void TApplicationLog::AddStartupInfo()
 {
-  TSessionLog::DoAddStartupInfo(Log, Configuration);
+  if (Logging)
+  {
+    TSessionLog::DoAddStartupInfo(Log, Configuration);
+  }
 }
 //---------------------------------------------------------------------------
 void __fastcall TApplicationLog::Log(const UnicodeString & S)