[Libreoffice-commits] online.git: loolwsd/LOOLForKit.cpp loolwsd/LOOLKit.cpp

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp |    2 +-
 loolwsd/LOOLKit.cpp    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 735713bfb495c4659a57db1d85a923b1ec00080b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 7 11:49:18 2016 +0300

    The withColor parameter to Log::initialize() is bool
    
    So passing a char* that never is null meant it will always be
    automatically converted to true, which is not useful.

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 32e7b93..7a38541 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -209,7 +209,7 @@ int main(int argc, char** argv)
         logProperties["path"] = std::string(logFilename);
     }
 
-    Log::initialize("frk", logLevel ? logLevel : "", logColor ? logColor : "", logToFile, logProperties);
+    Log::initialize("frk", logLevel ? logLevel : "", logColor != nullptr, logToFile, logProperties);
 
     Util::setTerminationSignals();
     Util::setFatalSignals();
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 675d126..575b947 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1367,7 +1367,7 @@ void lokit_main(const std::string& childRoot,
         logProperties["path"] = std::string(logFilename);
     }
 
-    Log::initialize("kit", logLevel ? logLevel : "", logColor ? logColor : "", logToFile, logProperties);
+    Log::initialize("kit", logLevel ? logLevel : "", logColor != nullptr, logToFile, logProperties);
     Util::rng::reseed();
 
     assert(!childRoot.empty());