mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Change portable folder to Qt's "Application dir path"
Enable portable mode if there's a "portable" file or folder in the Application dir path Fix #334
This commit is contained in:
parent
597660af2f
commit
387ac9b2f6
2 changed files with 12 additions and 2 deletions
|
@ -1,5 +1,6 @@
|
||||||
#include "pathmanager.hpp"
|
#include "singletons/pathmanager.hpp"
|
||||||
|
|
||||||
|
#include <QCoreApplication>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
|
||||||
|
@ -23,10 +24,14 @@ bool PathManager::init(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (QFileInfo::exists(QCoreApplication::applicationDirPath() + "/portable")) {
|
||||||
|
portable = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Root path = %APPDATA%/Chatterino or the folder that the executable resides in
|
// Root path = %APPDATA%/Chatterino or the folder that the executable resides in
|
||||||
QString rootPath;
|
QString rootPath;
|
||||||
if (portable) {
|
if (portable) {
|
||||||
rootPath.append(QDir::currentPath());
|
rootPath.append(QCoreApplication::applicationDirPath());
|
||||||
} else {
|
} else {
|
||||||
// Get settings path
|
// Get settings path
|
||||||
rootPath.append(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
|
rootPath.append(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
|
||||||
|
|
|
@ -14,8 +14,13 @@ public:
|
||||||
|
|
||||||
bool init(int argc, char **argv);
|
bool init(int argc, char **argv);
|
||||||
|
|
||||||
|
// %APPDATA%/chatterino or ExecutablePath for portable mode
|
||||||
QString settingsFolderPath;
|
QString settingsFolderPath;
|
||||||
|
|
||||||
|
// %APPDATA%/chatterino/Custom or ExecutablePath/Custom for portable mode
|
||||||
QString customFolderPath;
|
QString customFolderPath;
|
||||||
|
|
||||||
|
// %APPDATA%/chatterino/Cache or ExecutablePath/Cache for portable mode
|
||||||
QString cacheFolderPath;
|
QString cacheFolderPath;
|
||||||
|
|
||||||
// Logs
|
// Logs
|
||||||
|
|
Loading…
Reference in a new issue