2 files changed, 3 insertions, 10 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index ee0bc3bdb4..5f421de2d8 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -145,13 +145,6 @@ bool update_onvol_change(struct gui_wps * gwps)
 
 bool ffwd_rew(int button)
 {
-    static const uint16_t ff_rew_steps[] = {
-      1000, 2000, 3000, 4000,
-      5000, 6000, 8000, 10000,
-      15000, 20000, 25000, 30000,
-      45000, 60000
-    };
-
     unsigned int step = 0;     /* current ff/rewind step */ 
     unsigned int max_step = 0; /* maximum ff/rewind step */ 
     int ff_rewind_count = 0;   /* current ff/rewind count (in ticks) */
@@ -227,7 +220,7 @@ bool ffwd_rew(int button)
 
                         wps_state.ff_rewind = true;
 
-                        step = ff_rew_steps[global_settings.ff_rewind_min_step];
+                        step = 1000 * global_settings.ff_rewind_min_step;
 
                         accel_tick = current_tick +
                             global_settings.ff_rewind_accel*HZ; 
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index a72cdb5a60..2feece3b94 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -398,9 +398,9 @@ bool option_screen(struct settings_list *setting,
             const struct table_setting *info = setting->table_setting;
             int i;
             nb_items = info->count;
-            selected = 0;
+            selected = -1;
             table_setting_array_position = -1;
-            for (i=0;selected==0 && i<nb_items;i++)
+            for (i=0;selected==-1 && i<nb_items;i++)
             {
                 if (setting->flags&F_ALLOW_ARBITRARY_VALS &&
                     (oldvalue < info->values[i]))