From 7fdaa5c9df2e632685ef2d8d0177ac22b7145a6f Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 22 Jan 2012 18:20:24 +0100 Subject: [PATCH] Log-related cli options are not present in client-only mode Looks like KDE does not like it if we ask for an option that hasn't been specified. --- src/common/quassel.cpp | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index 30572faf..f84001f5 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -118,26 +118,28 @@ bool Quassel::init() { DEBUG = isOptionSet("debug"); // set up logging - if(isOptionSet("loglevel")) { - QString level = optionValue("loglevel"); - - if(level == "Debug") _logLevel = DebugLevel; - else if(level == "Info") _logLevel = InfoLevel; - else if(level == "Warning") _logLevel= WarningLevel; - else if(level == "Error") _logLevel = ErrorLevel; - } + if(Quassel::runMode() != Quassel::ClientOnly) { + if(isOptionSet("loglevel")) { + QString level = optionValue("loglevel"); + + if(level == "Debug") _logLevel = DebugLevel; + else if(level == "Info") _logLevel = InfoLevel; + else if(level == "Warning") _logLevel= WarningLevel; + else if(level == "Error") _logLevel = ErrorLevel; + } - QString logfilename = optionValue("logfile"); - if(!logfilename.isEmpty()) { - _logFile = new QFile(logfilename); - if(!_logFile->open(QIODevice::Append | QIODevice::Text)) { - qWarning() << "Could not open log file" << logfilename << ":" << _logFile->errorString(); - _logFile->deleteLater(); - _logFile = 0; + QString logfilename = optionValue("logfile"); + if(!logfilename.isEmpty()) { + _logFile = new QFile(logfilename); + if(!_logFile->open(QIODevice::Append | QIODevice::Text)) { + qWarning() << "Could not open log file" << logfilename << ":" << _logFile->errorString(); + _logFile->deleteLater(); + _logFile = 0; + } } - } - _logToSyslog = isOptionSet("syslog"); + _logToSyslog = isOptionSet("syslog"); + } return true; } -- 2.20.1