diff options
-rw-r--r-- | apps/settings.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings.c b/apps/settings.c index b0da64f42a..cee7a286f6 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -82,7 +82,7 @@ offset abs | |||
82 | 0x0d 0x21 <resume settings byte> | 82 | 0x0d 0x21 <resume settings byte> |
83 | 0x0e 0x22 <shuffle,dirfilter,sort_case,discharge,statusbar,show_hidden, | 83 | 0x0e 0x22 <shuffle,dirfilter,sort_case,discharge,statusbar,show_hidden, |
84 | scroll bar> | 84 | scroll bar> |
85 | 0x0f 0x23 <timeformat, scroll speed. volume type, battery type> | 85 | 0x0f 0x23 <volume type, battery type, timeformat, scroll speed> |
86 | 0x10 0x24 <ff/rewind min step, acceleration rate> | 86 | 0x10 0x24 <ff/rewind min step, acceleration rate> |
87 | 0x11 0x25 <AVC, channel config> | 87 | 0x11 0x25 <AVC, channel config> |
88 | 0x12 0x26 <(int) Resume playlist index, or -1 if no playlist resume> | 88 | 0x12 0x26 <(int) Resume playlist index, or -1 if no playlist resume> |
@@ -296,10 +296,10 @@ int settings_save( void ) | |||
296 | ((global_settings.scrollbar & 1) << 6)); | 296 | ((global_settings.scrollbar & 1) << 6)); |
297 | 297 | ||
298 | config_block[0xf] = (unsigned char) | 298 | config_block[0xf] = (unsigned char) |
299 | (((global_settings.timeformat & 1) << 2) | | 299 | ((global_settings.volume_type & 1) | |
300 | ( global_settings.scroll_speed << 3) | | 300 | ((global_settings.battery_type & 1) << 1) | |
301 | ((global_settings.volume_type & 1) << 4) | | 301 | ((global_settings.timeformat & 1) << 2) | |
302 | ((global_settings.battery_type & 1) << 5)); | 302 | ( global_settings.scroll_speed << 3)); |
303 | 303 | ||
304 | config_block[0x10] = (unsigned char) | 304 | config_block[0x10] = (unsigned char) |
305 | ((global_settings.ff_rewind_min_step & 15) << 4 | | 305 | ((global_settings.ff_rewind_min_step & 15) << 4 | |
@@ -466,10 +466,10 @@ void settings_load(void) | |||
466 | } | 466 | } |
467 | 467 | ||
468 | if (config_block[0xf] != 0xFF) { | 468 | if (config_block[0xf] != 0xFF) { |
469 | global_settings.volume_type = config_block[0xf] & 1; | ||
470 | global_settings.battery_type = (config_block[0xf] >> 1) & 1; | ||
469 | global_settings.timeformat = (config_block[0xf] >> 2) & 1; | 471 | global_settings.timeformat = (config_block[0xf] >> 2) & 1; |
470 | global_settings.scroll_speed = config_block[0xf] >> 3; | 472 | global_settings.scroll_speed = config_block[0xf] >> 3; |
471 | global_settings.volume_type = (config_block[0xf] >> 4) & 1; | ||
472 | global_settings.battery_type = (config_block[0xf] >> 5) & 1; | ||
473 | } | 473 | } |
474 | 474 | ||
475 | if (config_block[0x10] != 0xFF) { | 475 | if (config_block[0x10] != 0xFF) { |