diff --git a/lib/settings b/lib/settings index 29accdf9d..0be7cf24b 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 29accdf9dea05947d687112594ad06bf6001ee0a +Subproject commit 0be7cf24b80cb9b7c1063fde2798f05d735278dd diff --git a/src/common/ChatterinoSetting.hpp b/src/common/ChatterinoSetting.hpp index 226610381..370f58414 100644 --- a/src/common/ChatterinoSetting.hpp +++ b/src/common/ChatterinoSetting.hpp @@ -41,7 +41,7 @@ public: using pajlada::Settings::Setting::operator==; using pajlada::Settings::Setting::operator!=; - using pajlada::Settings::Setting::operator const Type; + using pajlada::Settings::Setting::operator Type; }; using BoolSetting = ChatterinoSetting; diff --git a/src/main.cpp b/src/main.cpp index aa7e53aca..9be014123 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -128,7 +128,7 @@ int runGui(QApplication &a, int argc, char *argv[]) QFile::remove(runningPath); // Save settings - pajlada::Settings::SettingManager::save(); + pajlada::Settings::SettingManager::gSave(); // Deinitialize NetworkManager (stop thread and wait for finish, should be instant) chatterino::NetworkManager::deinit(); diff --git a/src/singletons/Settings.cpp b/src/singletons/Settings.cpp index d2c1718cd..79398197f 100644 --- a/src/singletons/Settings.cpp +++ b/src/singletons/Settings.cpp @@ -35,7 +35,7 @@ void Settings::load() { QString settingsPath = getPaths()->settingsDirectory + "/settings.json"; - pajlada::Settings::SettingManager::load(qPrintable(settingsPath)); + pajlada::Settings::SettingManager::gLoad(qPrintable(settingsPath)); } void Settings::saveSnapshot()