devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

corrected logic in expression of jdgordon's r14187 commit; should fix FS#7590. Tidied up exit paths while I was at it.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14313 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Kukla 2007-08-13 13:53:33 +00:00
parent 41a5776539
commit 2ae0d63c88
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/plugins/viewer.c
View file

@ -377,7 +377,7 @@ static unsigned char* find_last_space(const unsigned char* p, int size)
for (i=size-1; i>=0; i--) for (i=size-1; i>=0; i--)
for (j=k; j < (int) sizeof(line_break); j++) for (j=k; j < (int) sizeof(line_break); j++)
{ {
if (((p[i] != '-') && (prefs.word_mode != WRAP))) if (!((p[i] == '-') && (prefs.word_mode == WRAP)))
if (p[i] == line_break[j]) if (p[i] == line_break[j])
return (unsigned char*) p+i; return (unsigned char*) p+i;
} }
@ -1128,6 +1128,9 @@ static void viewer_load_settings(void) /* same name as global, but not the same
static void viewer_save_settings(void)/* same name as global, but not the same file.. */ static void viewer_save_settings(void)/* same name as global, but not the same file.. */
{ {
int settings_fd; int settings_fd;
rb->splash(1, "Saving Settings");
settings_fd = rb->creat(SETTINGS_FILE); /* create the settings file */ settings_fd = rb->creat(SETTINGS_FILE); /* create the settings file */
rb->write (settings_fd, &prefs, sizeof(struct preferences)); rb->write (settings_fd, &prefs, sizeof(struct preferences));
@ -1320,7 +1323,6 @@ static void viewer_menu(void)
switch (result) switch (result)
{ {
case 0: /* quit */ case 0: /* quit */
rb->splash(1, "Saving Settings");
menu_exit(m); menu_exit(m);
viewer_exit(NULL); viewer_exit(NULL);
done = true; done = true;
@ -1357,9 +1359,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
file_name = file; file_name = file;
ok = viewer_init(); ok = viewer_init();
if (!ok) { if (!ok) {
rb->splash(HZ, "Error"); rb->splash(HZ, "Error opening file.");
viewer_exit(NULL); return PLUGIN_ERROR;
return PLUGIN_OK;
} }
viewer_reset_settings(); /* load defaults first */ viewer_reset_settings(); /* load defaults first */