[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sal/osl

[Thorsten Behrens]

 sal/osl/all/log.cxx |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 777fe663fdcccc8ae2233cfb8287e888a9e5bf87
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date:   Mon Jun 4 13:41:22 2018 +0200

    sal: fix logfile path retrieval from logging.ini
    
    Change-Id: I39803413533ae5b291d2e1abf4aa1bfe1f5900b5
    Reviewed-on: https://gerrit.libreoffice.org/55268
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
    (cherry picked from commit 423d01ec92a2c99ca8309a78f6763478e299f6a3)
    Reviewed-on: https://gerrit.libreoffice.org/55321

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 6a5884211949..4b6016e00951 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -156,14 +156,19 @@ char const * getLogLevel() {
 std::ofstream * getLogFile() {
     // First check the environment variable, then the setting in logging.ini
     static char const * logFile = getEnvironmentVariable("SAL_LOG_FILE");
-    if (!logFile)
-        return nullptr;
 
+    if (!logFile)
+    {
 #ifdef WNT
-    static char logFilePath[INI_STRINGBUF_SIZE];
-    if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
-        logFile = logFilePath;
+        static char logFilePath[INI_STRINGBUF_SIZE];
+        if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
+            logFile = logFilePath;
+        else
+            return nullptr;
+#else
+        return nullptr;
 #endif
+    }
 
     // stays until process exits
     static std::ofstream file(logFile, std::ios::app | std::ios::out);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits