diff options
author | Björn Stenberg <bjorn@haxx.se> | 2007-11-21 23:36:30 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2007-11-21 23:36:30 +0000 |
commit | e2e287d80e52b51120d600da7aa997ddeccb126d (patch) | |
tree | fa6b591e88a6d9df59a789614da0f4be39f7b6e5 /apps | |
parent | 8405fc9eeee07e6f75f2bcbaa45618aeda97050b (diff) |
Removed annoying splash
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15746 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/viewer.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index a517e93873..5891ca9736 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -1086,18 +1086,13 @@ static void viewer_load_settings(void) /* same name as global, but not the same /* read settings file */ settings_fd=rb->open(SETTINGS_FILE, O_RDONLY); - if ((settings_fd < 0) || (rb->filesize(settings_fd) != sizeof(struct preferences))) - { - rb->splash(HZ*2, "No Valid Settings File"); - } - else + if (settings_fd && (rb->filesize(settings_fd) == sizeof(struct preferences))) { rb->read(settings_fd, &prefs, sizeof(struct preferences)); rb->close(settings_fd); + rb->memcpy(&old_prefs, &prefs, sizeof(struct preferences)); } - rb->memcpy(&old_prefs, &prefs, sizeof(struct preferences)); - data = (struct bookmark_file_data*)buffer; /* grab the text buffer */ data->bookmarked_files_count = 0; |