diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-01-20 13:18:59 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-01-20 13:18:59 +0000 |
commit | 39051a548f4f10946b0898a928cfcfe2c8e4ae3e (patch) | |
tree | 3e2e81772becb2090ffe46e14d7aa1082f7a7130 | |
parent | f33b95143016e64e012071518ae868fb05d11ea2 (diff) | |
download | rockbox-39051a548f4f10946b0898a928cfcfe2c8e4ae3e.tar.gz rockbox-39051a548f4f10946b0898a928cfcfe2c8e4ae3e.zip |
The bookmark options were incorrectly read from the settings block, even if the data was uninitialized.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4262 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index 606e3750d4..abb2b79dca 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -775,9 +775,11 @@ void settings_load(void) | |||
775 | if (config_block[0xa9] != 0xff) | 775 | if (config_block[0xa9] != 0xff) |
776 | global_settings.jump_scroll_delay = config_block[0xa9]; | 776 | global_settings.jump_scroll_delay = config_block[0xa9]; |
777 | #endif | 777 | #endif |
778 | global_settings.usemrb = (config_block[0xaf] >> 5) & 3; | 778 | if(config_block[0xaf] != 0xff) { |
779 | global_settings.autocreatebookmark = (config_block[0xaf] >> 2) & 7; | 779 | global_settings.usemrb = (config_block[0xaf] >> 5) & 3; |
780 | global_settings.autoloadbookmark = (config_block[0xaf]) & 3; | 780 | global_settings.autocreatebookmark = (config_block[0xaf] >> 2) & 7; |
781 | global_settings.autoloadbookmark = (config_block[0xaf]) & 3; | ||
782 | } | ||
781 | } | 783 | } |
782 | 784 | ||
783 | settings_apply(); | 785 | settings_apply(); |