From b4a0e0ac2d27233f2d3f1140b9b3a4442638ffbf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 1 Jun 2015 16:50:09 +0200 Subject: [PATCH] Rename menu_entries_select_back to menu_entry_go_back --- menu/menu_entries_cbs_cancel.c | 2 +- menu/menu_entry.c | 26 +++++++++++++------------- menu/menu_entry.h | 2 +- ui/drivers/cocoa/cocoatouch_menu.m | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/menu/menu_entries_cbs_cancel.c b/menu/menu_entries_cbs_cancel.c index 0c7db30025..38c669af16 100644 --- a/menu/menu_entries_cbs_cancel.c +++ b/menu/menu_entries_cbs_cancel.c @@ -22,7 +22,7 @@ static int action_cancel_pop_default(const char *path, const char *label, unsigned type, size_t idx) { - return menu_entries_select_back(); + return menu_entry_go_back(); } void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, diff --git a/menu/menu_entry.c b/menu/menu_entry.c index c9eca40685..766dd63da0 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -81,7 +81,7 @@ int menu_entries_get_title(char *title, size_t title_len) uint32_t menu_entries_show_back(void) { menu_list_t *menu_list = menu_list_get_ptr(); - + if (!menu_list) return false; @@ -89,21 +89,21 @@ uint32_t menu_entries_show_back(void) } /* Clicks the back button */ -int menu_entries_select_back(void) +int menu_entry_go_back(void) { - menu_list_t *menu_list = menu_list_get_ptr(); - if (!menu_list) - return -1; - - menu_setting_apply_deferred(); - menu_list_pop_stack(menu_list); - - if (menu_needs_refresh()) + menu_list_t *menu_list = menu_list_get_ptr(); + if (!menu_list) + return -1; + + menu_setting_apply_deferred(); + menu_list_pop_stack(menu_list); + + if (menu_needs_refresh()) menu_do_refresh(MENU_ACTION_CANCEL); - rarch_main_data_iterate(); - - return 0; + rarch_main_data_iterate(); + + return 0; } // Sets title_msg to the name of the current core (shown at the top of the UI) diff --git a/menu/menu_entry.h b/menu/menu_entry.h index ae765848be..94e225b0d2 100644 --- a/menu/menu_entry.h +++ b/menu/menu_entry.h @@ -55,7 +55,7 @@ int menu_entries_get_title(char *title, size_t title_len); uint32_t menu_entries_show_back(void); -int menu_entries_select_back(void); +int menu_entry_go_back(void); void menu_entries_get_core_title(char *title_msg, size_t title_msg_len); diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index b612a64c1c..d83ad45c23 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -745,7 +745,7 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)menuBack { - menu_entries_select_back(); + menu_entry_go_back(); } @end