aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2532 from ZeldaZach/listover

Browse source 
Temp fix for crash on logging - QList instead of QVector hides whatever double-free bug we're causing
This commit is contained in:
Gavin Bisesi 2017-03-24 15:51:26 -04:00 committed by GitHub
commit 1879b906e5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/dlg_viewlog.cpp
View file

@ -24,7 +24,7 @@ DlgViewLog::DlgViewLog(QWidget *parent)
void DlgViewLog::loadInitialLogBuffer() void DlgViewLog::loadInitialLogBuffer()
{ {
QVector<QString> logBuffer = Logger::getInstance().getLogBuffer(); QList<QString> logBuffer = Logger::getInstance().getLogBuffer();
foreach(QString message, logBuffer) foreach(QString message, logBuffer)
logEntryAdded(message); logEntryAdded(message);
} }

4
cockatrice/src/logger.h
View file

@ -25,11 +25,11 @@ private:
QTextStream fileStream; QTextStream fileStream;
QFile fileHandle; QFile fileHandle;
QVector<QString> logBuffer; QList<QString> logBuffer;
public: public:
void logToFile(bool enabled); void logToFile(bool enabled);
void log(QtMsgType type, const QMessageLogContext &ctx, const QString &message); void log(QtMsgType type, const QMessageLogContext &ctx, const QString &message);
QVector<QString> getLogBuffer() { return logBuffer; } QList<QString> getLogBuffer() { return logBuffer; }
protected: protected:
void openLogfileSession(); void openLogfileSession();
void closeLogfileSession(); void closeLogfileSession();