2 files changed, 14 insertions, 7 deletions

diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index b8b1cc505b..0414b70801 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -336,7 +336,14 @@ bool option_screen(struct settings_list *setting,
             int min = sound_min(setting_id);
             int max = sound_max(setting_id);
             nb_items = (max-min)/steps + 1;
-            selected = (max-oldvalue)/steps;
+            if (setting->flags&F_FLIPLIST)
+            {
+                selected = (oldvalue - min) / steps;
+            }
+            else
+            {
+                selected = (max - oldvalue) / steps;
+            }
             function = sound_get_fn(setting_id);
         }
         else
diff --git a/apps/settings_list.c b/apps/settings_list.c
index a409d51df1..7a04aebd32 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -375,17 +375,17 @@ static long jumpscroll_getlang(int value)
     (CONFIG_KEYPAD == IPOD_3G_PAD)  || \
     (CONFIG_KEYPAD == IPOD_4G_PAD)  || \
     (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#define BALANCE_FLIP F_FLIPLIST
+#define FLIP_IF_WHEEL F_FLIPLIST
 #else
-#define BALANCE_FLIP 0
+#define FLIP_IF_WHEEL 0
 #endif
                     
 const struct settings_list settings[] = {
     /* sound settings */
-    SOUND_SETTING(F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME),
-    SOUND_SETTING(BALANCE_FLIP, balance, LANG_BALANCE, "balance", SOUND_BALANCE),
-    SOUND_SETTING(F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS),
-    SOUND_SETTING(F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE),
+    SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME),
+    SOUND_SETTING(FLIP_IF_WHEEL, balance, LANG_BALANCE, "balance", SOUND_BALANCE),
+    SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS),
+    SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE),
     
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
     SOUND_SETTING(0,loudness, LANG_LOUDNESS, "loudness", SOUND_LOUDNESS),