From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 22 Jan 2012 17:20:24 +0000 (+0100)
Subject: Log-related cli options are not present in client-only mode
X-Git-Tag: 0.8-beta1~52
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7fdaa5c9df2e632685ef2d8d0177ac22b7145a6f;ds=sidebyside

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.
---

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;
 }