From 4b38187d2059c0b37c7021c4e5f064874497c117 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Thu, 2 Oct 2014 23:00:17 +0200
Subject: [PATCH] Fix logfile option in servatrice.ini
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

servatrice was using hardcocded filename “server.log” even if a custom
value was specified
---
 servatrice/src/main.cpp          | 2 +-
 servatrice/src/server_logger.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index b2feac42..b1928208 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
 	logger->moveToThread(loggerThread);
 	
 	loggerThread->start();
-	QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settingsCache->value("server/logfile").toString()));
+	QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settingsCache->value("server/logfile", QString("server.log")).toString()));
 
 #if QT_VERSION < 0x050000
 	if (logToConsole)
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 9d3a81a3..1a1e4bed 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -26,7 +26,7 @@ ServerLogger::~ServerLogger()
 void ServerLogger::startLog(const QString &logFileName)
 {
     if (!logFileName.isEmpty()) {
-        logFile = new QFile("server.log", this);
+        logFile = new QFile(logFileName, this);
         logFile->open(QIODevice::Append);
 #ifdef Q_OS_UNIX
         ::socketpair(AF_UNIX, SOCK_STREAM, 0, sigHupFD);