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 /apps | |
| parent | f33b95143016e64e012071518ae868fb05d11ea2 (diff) | |
| download | rockbox-39051a548f4f10946b0898a928cfcfe2c8e4ae3e.zip rockbox-39051a548f4f10946b0898a928cfcfe2c8e4ae3e.tar.gz rockbox-39051a548f4f10946b0898a928cfcfe2c8e4ae3e.tar.bz2 rockbox-39051a548f4f10946b0898a928cfcfe2c8e4ae3e.tar.xz | |
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
Diffstat (limited to 'apps')
| -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 606e375..abb2b79 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -775,9 +775,11 @@ void settings_load(void) if (config_block[0xa9] != 0xff) global_settings.jump_scroll_delay = config_block[0xa9]; #endif - global_settings.usemrb = (config_block[0xaf] >> 5) & 3; - global_settings.autocreatebookmark = (config_block[0xaf] >> 2) & 7; - global_settings.autoloadbookmark = (config_block[0xaf]) & 3; + if(config_block[0xaf] != 0xff) { + global_settings.usemrb = (config_block[0xaf] >> 5) & 3; + global_settings.autocreatebookmark = (config_block[0xaf] >> 2) & 7; + global_settings.autoloadbookmark = (config_block[0xaf]) & 3; + } } settings_apply(); |