From 167800320ff0fbeda001f3a355e6d0896fabb5ca Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 5 Oct 2020 19:34:46 +0200 Subject: [PATCH] Make sure --logfile has precedence on config Since we changed the default in the config file and since log dir had precedence on log file, the --logfile command line option wasn't doing anything anymore. We make sure it has an effect again overriding --logdir or the logDir config entry. Signed-off-by: Kevin Ottens --- src/gui/application.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 9ac569cbc..a408b392b 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -408,7 +408,9 @@ void Application::setupLogging() // might be called from second instance auto logger = Logger::instance(); logger->setLogFile(_logFile); - logger->setLogDir(!_logDir.isEmpty() ? _logDir : ConfigFile().logDir()); + if (_logFile.isEmpty()) { + logger->setLogDir(_logDir.isEmpty() ? ConfigFile().logDir() : _logDir); + } logger->setLogExpire(_logExpire > 0 ? _logExpire : ConfigFile().logExpire()); logger->setLogFlush(_logFlush || ConfigFile().logFlush()); logger->setLogDebug(_logDebug || ConfigFile().logDebug()); -- 2.30.2