diff options
Diffstat (limited to 'apps/menu.c')
-rw-r--r-- | apps/menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/menu.c b/apps/menu.c index c4f3024930..4991b05383 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -68,7 +68,7 @@ static int current_subitems_count = 0; | |||
68 | static int talk_menu_item(int selected_item, void *data); | 68 | static int talk_menu_item(int selected_item, void *data); |
69 | 69 | ||
70 | static void get_menu_callback(const struct menu_item_ex *m, | 70 | static void get_menu_callback(const struct menu_item_ex *m, |
71 | menu_callback_type *menu_callback) | 71 | menu_callback_type *menu_callback) |
72 | { | 72 | { |
73 | if (m->flags&(MENU_HAS_DESC|MENU_DYNAMIC_DESC)) | 73 | if (m->flags&(MENU_HAS_DESC|MENU_DYNAMIC_DESC)) |
74 | *menu_callback= m->callback_and_desc->menu_callback; | 74 | *menu_callback= m->callback_and_desc->menu_callback; |
@@ -340,7 +340,7 @@ void do_setting_screen(const struct settings_list *setting, const char * title, | |||
340 | option_screen((struct settings_list *)setting, parent, | 340 | option_screen((struct settings_list *)setting, parent, |
341 | setting->flags&F_TEMPVAR, (char*)title); | 341 | setting->flags&F_TEMPVAR, (char*)title); |
342 | } | 342 | } |
343 | 343 | ||
344 | 344 | ||
345 | void do_setting_from_menu(const struct menu_item_ex *temp, | 345 | void do_setting_from_menu(const struct menu_item_ex *temp, |
346 | struct viewport parent[NB_SCREENS]) | 346 | struct viewport parent[NB_SCREENS]) |
@@ -501,12 +501,12 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
501 | ID2P(LANG_RIGHT_QS_ITEM), | 501 | ID2P(LANG_RIGHT_QS_ITEM), |
502 | ID2P(LANG_ADD_TO_FAVES)); | 502 | ID2P(LANG_ADD_TO_FAVES)); |
503 | #endif | 503 | #endif |
504 | MENUITEM_STRINGLIST(notquickscreen_able_option, | 504 | MENUITEM_STRINGLIST(notquickscreen_able_option, |
505 | ID2P(LANG_ONPLAY_MENU_TITLE), NULL, | 505 | ID2P(LANG_ONPLAY_MENU_TITLE), NULL, |
506 | ID2P(LANG_RESET_SETTING)); | 506 | ID2P(LANG_RESET_SETTING)); |
507 | const struct menu_item_ex *menu; | 507 | const struct menu_item_ex *menu; |
508 | int menu_selection = 0; | 508 | int menu_selection = 0; |
509 | const struct settings_list *setting = | 509 | const struct settings_list *setting = |
510 | find_setting(temp->variable, NULL); | 510 | find_setting(temp->variable, NULL); |
511 | #ifdef HAVE_QUICKSCREEN | 511 | #ifdef HAVE_QUICKSCREEN |
512 | if (is_setting_quickscreenable(setting)) | 512 | if (is_setting_quickscreenable(setting)) |
@@ -574,7 +574,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
574 | if (!exiting_menu && (menu->flags&MENU_EXITAFTERTHISMENU)) | 574 | if (!exiting_menu && (menu->flags&MENU_EXITAFTERTHISMENU)) |
575 | done = true; | 575 | done = true; |
576 | else | 576 | else |
577 | init_menu_lists(menu, &lists, | 577 | init_menu_lists(menu, &lists, |
578 | menu_stack_selected_item[stack_top], false, vps); | 578 | menu_stack_selected_item[stack_top], false, vps); |
579 | redraw_lists = true; | 579 | redraw_lists = true; |
580 | /* new menu, so reload the callback */ | 580 | /* new menu, so reload the callback */ |
@@ -688,7 +688,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
688 | init_menu_lists(menu,&lists,selected,true,vps); | 688 | init_menu_lists(menu,&lists,selected,true,vps); |
689 | /* callback was changed, so reload the menu's callback */ | 689 | /* callback was changed, so reload the menu's callback */ |
690 | get_menu_callback(menu, &menu_callback); | 690 | get_menu_callback(menu, &menu_callback); |
691 | if ((menu->flags&MENU_EXITAFTERTHISMENU) && | 691 | if ((menu->flags&MENU_EXITAFTERTHISMENU) && |
692 | !(temp->flags&MENU_EXITAFTERTHISMENU)) | 692 | !(temp->flags&MENU_EXITAFTERTHISMENU)) |
693 | { | 693 | { |
694 | done = true; | 694 | done = true; |