gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-10 04:07:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #274 from ctrlaltca/serva_memleaks

Browse Source 
Removed a servatrice memleak
This commit is contained in:
Gavin Bisesi
2014-08-08 12:22:44 -04:00
parent 57efffcd2e 6e3c7d33da
commit 4e3d6a141c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servatrice/src/main.cpp
View File

@@ -29,6 +29,7 @@
#include "server_logger.h"
#include "rng_sfmt.h"
#include "version_string.h"
#include <google/protobuf/stubs/common.h>
#ifdef Q_OS_UNIX
#include <signal.h>
#endif
@@ -233,5 +234,8 @@ int main(int argc, char *argv[])
loggerThread->wait();
delete loggerThread;
// Delete all global objects allocated by libprotobuf.
google::protobuf::ShutdownProtobufLibrary();
return retval;
}

6
servatrice/src/server_logger.cpp
View File

@@ -50,9 +50,9 @@ void ServerLogger::logMessage(QString message, void *caller)
callerString = QString::number((qulonglong) caller, 16) + " ";
//filter out all log entries based on values in configuration file
QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
bool shouldWeWriteLog = settings->value("server/writelog").toBool();
QString logFilters = settings->value("server/logfilters").toString();
QSettings settings("servatrice.ini", QSettings::IniFormat);
bool shouldWeWriteLog = settings.value("server/writelog").toBool();
QString logFilters = settings.value("server/logfilters").toString();
QStringList listlogFilters = logFilters.split(",", QString::SkipEmptyParts);
bool shouldWeSkipLine = false;