The settings for battery and volume display were reversed in the expanded .cfg

loader.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3277 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 3 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 102b244796..0a00fc71ad 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -904,11 +904,11 @@ bool settings_load_config(char* file)
         else if (!strcasecmp(name, "play selected"))
             set_cfg_bool(&global_settings.play_selected, value);
         else if (!strcasecmp(name, "volume display")) {
-            static char* options[] = {"numeric", "graphic"};
+            static char* options[] = {"graphic", "numeric"};
             set_cfg_option(&global_settings.volume_type, value, options, 2);
         }
         else if (!strcasecmp(name, "battery display")) {
-            static char* options[] = {"numeric", "graphic"};
+            static char* options[] = {"graphic", "numeric"};
             set_cfg_option(&global_settings.battery_type, value, options, 2);
         }
         else if (!strcasecmp(name, "time format")) {
diff --git a/apps/settings.h b/apps/settings.h
index 68b2ba8874..bfdf12b593 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -112,7 +112,7 @@ struct user_settings
     int dirfilter;     /* 0=display all, 1=only supported, 2=only music */
     bool sort_case;    /* dir sort order: 0=case insensitive, 1=sensitive */
     int volume_type;   /* how volume is displayed: 0=graphic, 1=percent */
-    int battery_type;
+    int battery_type;  /* how battery is displayed: 0=graphic, 1=percent */
     int timeformat;    /* time format: 0=24 hour clock, 1=12 hour clock */
     int scroll_speed;  /* long texts scrolling speed: 1-30 */
     bool playlist_shuffle;