rename twitchaccount file to twitchuser to match class name
This commit is contained in:
@@ -15,14 +15,59 @@
|
||||
#include <QDir>
|
||||
#include <QStandardPaths>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <pajlada/settings/settingmanager.hpp>
|
||||
|
||||
using namespace chatterino;
|
||||
using namespace chatterino::widgets;
|
||||
|
||||
namespace {
|
||||
|
||||
inline bool initSettings(bool portable)
|
||||
{
|
||||
QString settingsPath;
|
||||
if (portable) {
|
||||
settingsPath.append(QDir::currentPath());
|
||||
} else {
|
||||
// Get settings path
|
||||
settingsPath.append(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
|
||||
if (settingsPath.isEmpty()) {
|
||||
printf("Error finding writable location for settings\n");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!QDir().mkpath(settingsPath)) {
|
||||
printf("Error creating directories for settings: %s\n", qPrintable(settingsPath));
|
||||
return false;
|
||||
}
|
||||
settingsPath.append("/settings.json");
|
||||
|
||||
pajlada::Settings::SettingManager::load(qPrintable(settingsPath));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
|
||||
// Options
|
||||
bool portable = false;
|
||||
|
||||
for (int i = 1; i < argc; ++i) {
|
||||
if (strcmp(argv[i], "portable") == 0) {
|
||||
portable = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize settings
|
||||
if (!initSettings(portable)) {
|
||||
printf("Error initializing settings\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
chatterino::logging::init();
|
||||
SettingsManager::getInstance().load();
|
||||
Resources::load();
|
||||
@@ -42,6 +87,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
SettingsManager::getInstance().save();
|
||||
|
||||
// Save settings
|
||||
pajlada::Settings::SettingManager::save();
|
||||
|
||||
WindowManager::getInstance().save();
|
||||
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user