From 22bf008bdfb494a79931b25fb3cfbf79da090130 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sun, 15 Jul 2018 11:03:25 +0000
Subject: [PATCH] Update new settings library version

---
 lib/settings                     | 2 +-
 src/common/ChatterinoSetting.hpp | 2 +-
 src/main.cpp                     | 2 +-
 src/singletons/Settings.cpp      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/settings b/lib/settings
index 29accdf9..0be7cf24 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 22661038..370f5841 100644
--- a/src/common/ChatterinoSetting.hpp
+++ b/src/common/ChatterinoSetting.hpp
@@ -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>;
diff --git a/src/main.cpp b/src/main.cpp
index aa7e53ac..9be01412 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 d2c1718c..79398197 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()