From 2b1fcb466b3694a900aab579d60d8e61456844f7 Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Sun, 5 Feb 2012 23:11:30 +0100 Subject: [PATCH 1/1] fix core output when using neither syslog nor logfile --- src/common/logger.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/common/logger.cpp b/src/common/logger.cpp index 78a3610c..bf270f9d 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -76,22 +76,21 @@ 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 ")); + // if we neither use syslog nor have a logfile we log to stdout - // if we don't have a logfile we log to stdout + if(Quassel::logFile() || !Quassel::logToSyslog()) { + _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss ")); - QTextStream out(stdout); - if(Quassel::logFile() && Quassel::logFile()->isOpen()) { - _buffer.remove(QChar('\n')); - out.setDevice(Quassel::logFile()); - } + QTextStream out(stdout); + if(Quassel::logFile() && Quassel::logFile()->isOpen()) { + _buffer.remove(QChar('\n')); + out.setDevice(Quassel::logFile()); + } - out << _buffer << endl; + out << _buffer << endl; + } } -- 2.20.1