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

The `saveAudioSettings()` function lead to an infinite loop of
saving.
---
 src/tabcontrollers/AudioTabController.cpp | 26 +++++++----------------
 src/tabcontrollers/AudioTabController.h   |  2 --
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index c052868..10aa673 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -117,15 +117,6 @@ void AudioTabController::reloadAudioSettings()
         settings::getSetting( settings::BoolSetting::AUDIO_micReversePtt ) );
 }
 
-void AudioTabController::saveAudioSettings()
-{
-    settings::setSetting(
-        settings::BoolSetting::AUDIO_micProximitySensorCanMute,
-        micProximitySensorCanMute() );
-    settings::setSetting( settings::BoolSetting::AUDIO_micReversePtt,
-                          micReversePtt() );
-}
-
 float AudioTabController::mirrorVolume() const
 {
     return m_mirrorVolume;
@@ -148,7 +139,8 @@ bool AudioTabController::micMuted() const
 
 bool AudioTabController::micProximitySensorCanMute() const
 {
-    return m_micProximitySensorCanMute;
+    return settings::getSetting(
+        settings::BoolSetting::AUDIO_micProximitySensorCanMute );
 }
 
 bool AudioTabController::micReversePtt() const
@@ -330,14 +322,13 @@ void AudioTabController::setMicMuted( bool value, bool notify )
 void AudioTabController::setMicProximitySensorCanMute( bool value, bool notify )
 {
     std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
-    if ( value != m_micProximitySensorCanMute )
+
+    settings::setSetting(
+        settings::BoolSetting::AUDIO_micProximitySensorCanMute, value );
+
+    if ( notify )
     {
-        m_micProximitySensorCanMute = value;
-        saveAudioSettings();
-        if ( notify )
-        {
-            emit micProximitySensorCanMuteChanged( value );
-        }
+        emit micProximitySensorCanMuteChanged( value );
     }
 }
 
@@ -347,7 +338,6 @@ void AudioTabController::setMicReversePtt( bool value, bool notify )
     if ( value != m_micReversePtt )
     {
         m_micReversePtt = value;
-        saveAudioSettings();
         if ( m_pttEnabled )
         {
             if ( m_pttActive )
diff --git a/src/tabcontrollers/AudioTabController.h b/src/tabcontrollers/AudioTabController.h
index 9fe7c6e..dca9a8c 100644
--- a/src/tabcontrollers/AudioTabController.h
+++ b/src/tabcontrollers/AudioTabController.h
@@ -71,7 +71,6 @@ private:
     int m_recordingDeviceIndex = -1;
     float m_micVolume = 1.0;
     bool m_micMuted = false;
-    bool m_micProximitySensorCanMute = false;
     bool m_micReversePtt = false;
     bool m_isDefaultAudioProfile = false;
     bool m_isPlaybackOverride = false;
@@ -129,7 +128,6 @@ public:
     void initStage2();
 
     void reloadAudioSettings();
-    void saveAudioSettings();
 
     void eventLoopTick();