summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-05-13 06:56:21 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-05-13 06:56:21 +0000
commit3fbe4d275ec13b566ca12a3c4f8e77987d6b6512 (patch)
tree0834194d4056874559f6faef93545c4d416bb69e
parentbc0434d63a351e7c69eec45fafc129c76274bea4 (diff)
downloadrockbox-3fbe4d275ec13b566ca12a3c4f8e77987d6b6512.tar.gz
rockbox-3fbe4d275ec13b566ca12a3c4f8e77987d6b6512.zip
fix FS#11264 - frequency bar and presets not working in the sbs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25982 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_display.c2
-rw-r--r--apps/recorder/radio.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 7710d58cea..e91d7f2f9d 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -164,7 +164,7 @@ static void draw_progressbar(struct gui_wps *gwps,
164 elapsed = id3->elapsed + state->ff_rewind_count; 164 elapsed = id3->elapsed + state->ff_rewind_count;
165 } 165 }
166#if CONFIG_TUNER 166#if CONFIG_TUNER
167 else if (in_radio_screen()) 167 else if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF))
168 { 168 {
169 int min = fm_region_data[global_settings.fm_region].freq_min; 169 int min = fm_region_data[global_settings.fm_region].freq_min;
170 elapsed = radio_current_frequency() - min; 170 elapsed = radio_current_frequency() - min;
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 6e79adf302..026579516b 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -715,8 +715,6 @@ int radio_screen(void)
715 radio_save_presets(); 715 radio_save_presets();
716 } 716 }
717 } 717 }
718 /* Clear the preset list on exit. */
719 clear_preset_list();
720 } 718 }
721 update_screen = true; 719 update_screen = true;
722 break; 720 break;
@@ -771,9 +769,6 @@ int radio_screen(void)
771 } 769 }
772 } 770 }
773 771
774 /* Clear the preset list on exit. */
775 clear_preset_list();
776
777 break; 772 break;
778 773
779 case ACTION_STD_PREV: 774 case ACTION_STD_PREV:
@@ -1316,7 +1311,6 @@ static int clear_preset_list(void)
1316 /* The preset list will be cleared switch to Scan Mode. */ 1311 /* The preset list will be cleared switch to Scan Mode. */
1317 radio_mode = RADIO_SCAN_MODE; 1312 radio_mode = RADIO_SCAN_MODE;
1318 curr_preset = -1; 1313 curr_preset = -1;
1319
1320 presets_changed = false; /* Don't ask to save when clearing the list. */ 1314 presets_changed = false; /* Don't ask to save when clearing the list. */
1321 1315
1322 return true; 1316 return true;