Merge branch 'master' into irc-support

This commit is contained in:
fourtf
2019-09-18 13:03:16 +02:00
204 changed files with 17026 additions and 16467 deletions
+2 -1
View File
@@ -8,6 +8,7 @@
#include <QStandardPaths>
#include <cassert>
#include "common/Modes.hpp"
#include "util/CombinePath.hpp"
namespace chatterino {
@@ -32,7 +33,7 @@ bool Paths::createFolder(const QString &folderPath)
bool Paths::isPortable()
{
return this->portable_.get();
return Modes::getInstance().isPortable;
}
QString Paths::cacheDirectory()