fix FS#11264 - frequency bar and presets not working in the sbs
authorjdgordon <jdgordon@a1c6a512-1295-4272-9138-f99709370657>
Thu, 13 May 2010 06:56:21 +0000 (13 06:56 +0000)
committerjdgordon <jdgordon@a1c6a512-1295-4272-9138-f99709370657>
Thu, 13 May 2010 06:56:21 +0000 (13 06:56 +0000)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25982 a1c6a512-1295-4272-9138-f99709370657

apps/gui/skin_engine/skin_display.c
apps/recorder/radio.c

index 7710d58..e91d7f2 100644 (file)
@@ -164,7 +164,7 @@ static void draw_progressbar(struct gui_wps *gwps,
         elapsed = id3->elapsed + state->ff_rewind_count;
     }
 #if CONFIG_TUNER
-    else if (in_radio_screen())
+    else if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF))
     {
         int min = fm_region_data[global_settings.fm_region].freq_min;
         elapsed = radio_current_frequency() - min;
index 6e79adf..0265795 100644 (file)
@@ -715,8 +715,6 @@ int radio_screen(void)
                                 radio_save_presets();
                         }
                     }
-                    /* Clear the preset list on exit. */
-                    clear_preset_list();
                 }
                 update_screen = true;
                 break;
@@ -771,9 +769,6 @@ int radio_screen(void)
                     }
                 }
 
-                /* Clear the preset list on exit. */
-                clear_preset_list();
-
                 break;
 
             case ACTION_STD_PREV:
@@ -1316,7 +1311,6 @@ static int clear_preset_list(void)
     /* The preset list will be cleared switch to Scan Mode. */
     radio_mode = RADIO_SCAN_MODE;
     curr_preset = -1;
-
     presets_changed = false; /* Don't ask to save when clearing the list. */
 
     return true;