From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 29 Jan 2012 23:23:37 +0000 (+0100)
Subject: Don't log to stdout if --syslog and/or --logfile are specified
X-Git-Tag: 0.8-beta1~30
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=245a92b091b754bfdb8a5d6bd4da470ead5aaa29;p=quassel.git

Don't log to stdout if --syslog and/or --logfile are specified
---

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index d9708f78..78a3610c 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -76,6 +76,9 @@ void Logger::log() {
     }
     syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
   }
+  // don't log to stdout if --syslog was specified (but neither ignore --logfile)
+  if(!Quassel::logFile())
+    return;
 #endif
 
   _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss "));