From 4ae8bd8fb57c243915e532f950d0b65fb0f878bd Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 16:28:25 +0100
Subject: [PATCH] Add m_vsyncDisabled to new settings API

---
 src/overlaycontroller.cpp          | 25 +++++++------------------
 src/overlaycontroller.h            |  1 -
 src/settings/settings.h            |  1 +
 src/settings/settings_controller.h |  4 ++++
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index bfd9ed0..91361e3 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -281,12 +281,7 @@ OverlayController::OverlayController( bool desktopMode,
     // Keep the settings for vsyncDisabled and crash recovery here in main
     // overlaycontroller
     appSettings()->beginGroup( "applicationSettings" );
-    auto value = appSettings()->value( "vsyncDisabled", m_vsyncDisabled );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_vsyncDisabled = value.toBool();
-    }
-    value = appSettings()->value( "customTickRateMs", m_customTickRateMs );
+    auto value = appSettings()->value( "customTickRateMs", m_customTickRateMs );
     if ( value.isValid() && !value.isNull() )
     {
         // keep sane tickrate (between 1~k_maxCustomTickRate)
@@ -768,23 +763,17 @@ void OverlayController::setCrashRecoveryDisabled( bool value, bool notify )
 
 bool OverlayController::vsyncDisabled() const
 {
-    return m_vsyncDisabled;
+    return settings::getSetting(
+        settings::BoolSetting::APPLICATION_vsyncDisabled );
 }
 
 void OverlayController::setVsyncDisabled( bool value, bool notify )
 {
-    if ( m_vsyncDisabled == value )
-    {
-        return;
-    }
-    m_vsyncDisabled = value;
-    appSettings()->beginGroup( "applicationSettings" );
-    appSettings()->setValue( "vsyncDisabled", m_vsyncDisabled );
-    appSettings()->endGroup();
-    appSettings()->sync();
+    settings::setSetting( settings::BoolSetting::APPLICATION_vsyncDisabled,
+                          value );
     if ( notify )
     {
-        emit vsyncDisabledChanged( m_vsyncDisabled );
+        emit vsyncDisabledChanged( value );
     }
 }
 
@@ -947,7 +936,7 @@ void OverlayController::setCustomTickRateMs( int value, bool notify )
 // mainEventLoop() or not.
 void OverlayController::OnTimeoutPumpEvents()
 {
-    if ( m_vsyncDisabled )
+    if ( vsyncDisabled() )
     {
         // check if it's time for a custom tick rate tick
         if ( m_customTickRateCounter > m_customTickRateMs )
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 51b7609..3387c22 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -123,7 +123,6 @@ private:
     bool m_previousShutdownSafe = true;
     bool m_noSound;
     bool m_crashRecoveryDisabled = false;
-    bool m_vsyncDisabled = false;
     bool m_enableDebug = false;
     bool m_disableVersionCheck = false;
     bool m_newVersionDetected = false;
diff --git a/src/settings/settings.h b/src/settings/settings.h
index 69a5aeb..c7236ad 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -25,6 +25,7 @@ enum class BoolSetting
 
     APPLICATION_disableVersionCheck,
     APPLICATION_previousShutdownSafe,
+    APPLICATION_vsyncDisabled,
 
     VIDEO_brightnessEnabled,
     VIDEO_isOverlayMethodActive,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index e830391..b67a5c0 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -227,6 +227,10 @@ private:
                           SettingCategory::Application,
                           QtInfo{ "previousShutdownSafe" },
                           true },
+        BoolSettingValue{ BoolSetting::APPLICATION_vsyncDisabled,
+                          SettingCategory::Application,
+                          QtInfo{ "vsyncDisabled" },
+                          false },
 
         BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
                           SettingCategory::Video,