noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update new settings library version

Browse source
This commit is contained in:
Rasmus Karlsson 2018-07-15 11:03:25 +00:00
parent a720c76dc0
commit 22bf008bdf
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/settings

@ -1 +1 @@
Subproject commit 29accdf9dea05947d687112594ad06bf6001ee0a
Subproject commit 0be7cf24b80cb9b7c1063fde2798f05d735278dd

2
src/common/ChatterinoSetting.hpp
View file

@ -41,7 +41,7 @@ public:
using pajlada::Settings::Setting<Type>::operator==;
using pajlada::Settings::Setting<Type>::operator!=;
using pajlada::Settings::Setting<Type>::operator const Type;
using pajlada::Settings::Setting<Type>::operator Type;
};
using BoolSetting = ChatterinoSetting<bool>;

2
src/main.cpp
View file

@ -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();

2
src/singletons/Settings.cpp
View file

@ -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()