From adc3a1e7b20f8a4e33f81a85dbe0dbe83dacfb64 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 16:38:03 +0100
Subject: [PATCH] Convert m_previousShutdownSafe to new settings API

---
 src/overlaycontroller.cpp | 23 ++++++++---------------
 src/overlaycontroller.h   |  6 +-----
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index 91361e3..29b808c 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -298,12 +298,6 @@ OverlayController::OverlayController( bool desktopMode,
             m_customTickRateMs = value.toInt();
         }
     }
-    value = appSettings()->value( "previousShutdownSafe",
-                                  m_previousShutdownSafe );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_previousShutdownSafe = value.toBool();
-    }
     value = appSettings()->value( "crashRecoveryDisabled",
                                   m_crashRecoveryDisabled );
     if ( value.isValid() && !value.isNull() )
@@ -884,15 +878,8 @@ void OverlayController::setDebugState( int value, bool notify )
 
 void OverlayController::setPreviousShutdownSafe( bool value )
 {
-    if ( m_previousShutdownSafe == value )
-    {
-        return;
-    }
-    m_previousShutdownSafe = value;
-    appSettings()->beginGroup( "applicationSettings" );
-    appSettings()->setValue( "previousShutdownSafe", m_previousShutdownSafe );
-    appSettings()->endGroup();
-    appSettings()->sync();
+    settings::setSetting(
+        settings::BoolSetting::APPLICATION_previousShutdownSafe, value );
 }
 
 int OverlayController::customTickRateMs() const
@@ -1468,6 +1455,12 @@ void OverlayController::RotateCollisionBounds( float angle, bool commit )
     }
 }
 
+bool OverlayController::isPreviousShutdownSafe()
+{
+    return settings::getSetting(
+        settings::BoolSetting::APPLICATION_previousShutdownSafe );
+}
+
 QString OverlayController::getVersionString()
 {
     return QString( application_strings::applicationVersionString );
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 3387c22..04a407f 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -120,7 +120,6 @@ private:
     Qt::MouseButtons m_lastMouseButtons = nullptr;
 
     bool m_desktopMode;
-    bool m_previousShutdownSafe = true;
     bool m_noSound;
     bool m_crashRecoveryDisabled = false;
     bool m_enableDebug = false;
@@ -219,10 +218,7 @@ public:
         return m_desktopMode;
     }
 
-    bool isPreviousShutdownSafe()
-    {
-        return m_previousShutdownSafe;
-    }
+    bool isPreviousShutdownSafe();
     void setPreviousShutdownSafe( bool value );
 
     utils::ChaperoneUtils& chaperoneUtils() noexcept