From d47c5705379a27bc4b7ecf50bf0a464c10b84ea7 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 2 Dec 2019 14:26:57 +0100
Subject: [PATCH] Convert m_disableChaperone to new settings API

---
 src/tabcontrollers/ChaperoneTabController.cpp | 18 ++++++++++--------
 src/tabcontrollers/ChaperoneTabController.h   |  1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index c59d1d7..04890a8 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -20,12 +20,11 @@ void ChaperoneTabController::initStage1()
         = settings->value( "chaperoneAlarmSoundDistance", 0.5f ).toFloat();
     m_chaperoneShowDashboardDistance
         = settings->value( "chaperoneShowDashboardDistance", 0.5f ).toFloat();
-    m_disableChaperone = settings->value( "disableChaperone", false ).toBool();
     m_fadeDistanceRemembered
         = settings->value( "fadeDistanceRemembered", 0.5f ).toFloat();
     settings->endGroup();
 
-    if ( m_disableChaperone )
+    if ( disableChaperone() )
     {
         setFadeDistance( 0.0f, true );
     }
@@ -873,7 +872,8 @@ bool ChaperoneTabController::isChaperoneAlarmSoundAdjustVolume() const
 
 bool ChaperoneTabController::disableChaperone() const
 {
-    return m_disableChaperone;
+    return settings::getSetting(
+        settings::BoolSetting::CHAPERONE_disableChaperone );
 }
 
 float ChaperoneTabController::chaperoneAlarmSoundDistance() const
@@ -1155,10 +1155,9 @@ void ChaperoneTabController::setChaperoneShowDashboardDistance( float value,
 
 void ChaperoneTabController::setDisableChaperone( bool value, bool notify )
 {
-    if ( m_disableChaperone != value )
+    if ( disableChaperone() != value )
     {
-        m_disableChaperone = value;
-        if ( m_disableChaperone )
+        if ( value )
         {
             m_fadeDistanceRemembered = m_fadeDistance;
             setFadeDistance( 0.0f, true );
@@ -1167,16 +1166,19 @@ void ChaperoneTabController::setDisableChaperone( bool value, bool notify )
         {
             setFadeDistance( m_fadeDistanceRemembered, true );
         }
+
         auto settings = OverlayController::appSettings();
         settings->beginGroup( "chaperoneSettings" );
         settings->setValue( "fadeDistanceRemembered",
                             m_fadeDistanceRemembered );
-        settings->setValue( "disableChaperone", m_disableChaperone );
         settings->endGroup();
         settings->sync();
+        settings::setSetting( settings::BoolSetting::CHAPERONE_disableChaperone,
+                              value );
+
         if ( notify )
         {
-            emit disableChaperoneChanged( m_disableChaperone );
+            emit disableChaperoneChanged( value );
         }
     }
 }
diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h
index 6b37453..fe02c40 100644
--- a/src/tabcontrollers/ChaperoneTabController.h
+++ b/src/tabcontrollers/ChaperoneTabController.h
@@ -134,7 +134,6 @@ private:
     bool m_centerMarker = false;
     bool m_playSpaceMarker = false;
     bool m_forceBounds = false;
-    bool m_disableChaperone = false;
     float m_fadeDistanceRemembered = 0.0f;
 
     float m_chaperoneSwitchToBeginnerDistance = 0.5f;