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

fix FS#9120 by actually quiting random folder advance config after choosing "ignore changes and quit"

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17864 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-06-29 02:39:09 +00:00
parent fa366af4b8
commit 47b67ba6f6
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/plugins/random_folder_advance_config.c
View file

@ -285,18 +285,18 @@ int save_list(void)
return 1; return 1;
} }
void edit_list(void) int edit_list(void)
{ {
struct gui_synclist lists; struct gui_synclist lists;
bool exit = false; bool exit = false;
int button,i; int button,i;
int selection; int selection, ret = 0;
/* load the dat file if not already done */ /* load the dat file if not already done */
if ((list == NULL || list->count == 0) && (i = load_list()) != 0) if ((list == NULL || list->count == 0) && (i = load_list()) != 0)
{ {
rb->splash(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); rb->splash(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i);
return; return -1;
} }
dirs_count = list->count; dirs_count = list->count;
@ -371,12 +371,14 @@ void edit_list(void)
save_list(); save_list();
case 1: case 1:
exit = true; exit = true;
ret = -2;
} }
menu_exit(m); menu_exit(m);
} }
break; break;
} }
} }
return ret;
} }
int export_list_to_file_text(void) int export_list_to_file_text(void)
@ -474,6 +476,7 @@ int import_list_from_file_text(void)
int main_menu(void) int main_menu(void)
{ {
int m; int m;
bool exit = false;
static const struct menu_item items[] = { static const struct menu_item items[] = {
{ "Generate Folder List", NULL }, { "Generate Folder List", NULL },
{ "Edit Folder List", NULL }, { "Edit Folder List", NULL },
@ -503,7 +506,8 @@ int main_menu(void)
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true); rb->cpu_boost(true);
#endif #endif
edit_list(); if (edit_list() < 0)
exit = true;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(false); rb->cpu_boost(false);
#endif #endif
@ -543,7 +547,7 @@ int main_menu(void)
return 1; return 1;
} }
menu_exit(m); menu_exit(m);
return 0; return exit?1:0;
} }
enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter)