commit 7a718fc27dfea78bb212b4fd492334f4f142594e
author Solomon Peachy <pizza@shaftnet.org> Sat Dec 22 22:07:19 2018 -0500
committer Solomon Peachy <pizza@shaftnet.org> Mon Dec 24 00:01:02 2018 +0100
tree f53f3c16a2815f65aca00408cab67f27b6fc27eb
parent d636c5e8233c7f0a71a38f9e92546675e171b282

Do not touch FM tuner when it is turned off

Credit to Igor Poretsky

Change-Id: Ie9e61740f87f3b56d0b602cd431757262a6ed808

apps/radio/presets.c

diff --git a/apps/radio/presets.c b/apps/radio/presets.c
index d9a2aa9..368cb71 100644
--- a/apps/radio/presets.c
+++ b/apps/radio/presets.c
@@ -516,7 +516,6 @@
                 curr_preset = gui_synclist_get_sel_pos(&lists);
                 curr_freq = presets[curr_preset].frequency;
                 next_station(0);
-                remember_frequency();
                 result = 1;
                 break;
             case ACTION_F3:

apps/radio/radio.c

diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index 49534ee..6055f64 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -333,7 +333,8 @@
     if (radio_status == FMRADIO_PLAYING)
         tuner_set(RADIO_MUTE, 1);
 
-    tuner_set(RADIO_FREQUENCY, curr_freq);
+    if(radio_status != FMRADIO_OFF)
+        tuner_set(RADIO_FREQUENCY, curr_freq);
 
     if (radio_status == FMRADIO_PLAYING)
         tuner_set(RADIO_MUTE, 0);
@@ -853,17 +854,19 @@
 
 void toggle_mono_mode(bool mono)
 {
-    tuner_set(RADIO_FORCE_MONO, mono);
+    if(radio_status != FMRADIO_OFF)
+        tuner_set(RADIO_FORCE_MONO, mono);
 }
 
 void set_radio_region(int region)
 {
 #ifdef HAVE_RADIO_REGION
-    tuner_set(RADIO_REGION, region);
+    if(radio_status != FMRADIO_OFF)
+        tuner_set(RADIO_REGION, region);
+#else
+    (void)region;
 #endif
     next_station(0);
-    remember_frequency();
-    (void)region;
 }
 
 #endif