From bed0939ddf091aba421e7e2d5c878fe1b59a9eff Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 16:44:14 +0100
Subject: [PATCH] Add m_crashRecoveryDisabled to new settings API

---
 src/overlaycontroller.cpp          | 22 +++++-----------------
 src/overlaycontroller.h            |  1 -
 src/settings/settings.h            |  1 +
 src/settings/settings_controller.h |  4 ++++
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index 29b808c..d8d282f 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -298,12 +298,6 @@ OverlayController::OverlayController( bool desktopMode,
             m_customTickRateMs = value.toInt();
         }
     }
-    value = appSettings()->value( "crashRecoveryDisabled",
-                                  m_crashRecoveryDisabled );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_crashRecoveryDisabled = value.toBool();
-    }
     value = appSettings()->value( "enableDebug", m_enableDebug );
     if ( value.isValid() && !value.isNull() )
     {
@@ -735,23 +729,17 @@ void OverlayController::processInputBindings()
 
 bool OverlayController::crashRecoveryDisabled() const
 {
-    return m_crashRecoveryDisabled;
+    return settings::getSetting(
+        settings::BoolSetting::APPLICATION_crashRecoveryDisabled );
 }
 
 void OverlayController::setCrashRecoveryDisabled( bool value, bool notify )
 {
-    if ( m_crashRecoveryDisabled == value )
-    {
-        return;
-    }
-    m_crashRecoveryDisabled = value;
-    appSettings()->beginGroup( "applicationSettings" );
-    appSettings()->setValue( "crashRecoveryDisabled", m_crashRecoveryDisabled );
-    appSettings()->endGroup();
-    appSettings()->sync();
+    settings::setSetting(
+        settings::BoolSetting::APPLICATION_crashRecoveryDisabled, value );
     if ( notify )
     {
-        emit crashRecoveryDisabledChanged( m_crashRecoveryDisabled );
+        emit crashRecoveryDisabledChanged( value );
     }
 }
 
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 04a407f..ee2de31 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -121,7 +121,6 @@ private:
 
     bool m_desktopMode;
     bool m_noSound;
-    bool m_crashRecoveryDisabled = 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 c7236ad..3f968df 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -26,6 +26,7 @@ enum class BoolSetting
     APPLICATION_disableVersionCheck,
     APPLICATION_previousShutdownSafe,
     APPLICATION_vsyncDisabled,
+    APPLICATION_crashRecoveryDisabled,
 
     VIDEO_brightnessEnabled,
     VIDEO_isOverlayMethodActive,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index b67a5c0..547195e 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -231,6 +231,10 @@ private:
                           SettingCategory::Application,
                           QtInfo{ "vsyncDisabled" },
                           false },
+        BoolSettingValue{ BoolSetting::APPLICATION_crashRecoveryDisabled,
+                          SettingCategory::Application,
+                          QtInfo{ "crashRecoveryDisabled" },
+                          false },
 
         BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
                           SettingCategory::Video,