Use menu_entries_select_back

This commit is contained in:
twinaphex 2015-05-15 00:19:36 +02:00
parent 14aa1a5bda
commit 3fea013c96
3 changed files with 8 additions and 12 deletions

View File

@ -16,7 +16,7 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "menu.h" #include "menu.h"
#include "menu_entries_cbs.h" #include "menu_entries_cbs.h"
#include "menu_list.h" #include "menu_entry.h"
#include "menu_setting.h" #include "menu_setting.h"
static int action_cancel_lookup_setting(const char *path, static int action_cancel_lookup_setting(const char *path,
@ -28,13 +28,7 @@ static int action_cancel_lookup_setting(const char *path,
static int action_cancel_pop_default(const char *path, static int action_cancel_pop_default(const char *path,
const char *label, unsigned type, size_t idx) const char *label, unsigned type, size_t idx)
{ {
menu_list_t *menu_list = menu_list_get_ptr(); return menu_entries_select_back();
if (!menu_list)
return -1;
menu_apply_deferred_settings();
menu_list_pop_stack(menu_list);
return 0;
} }
void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,

View File

@ -78,15 +78,17 @@ uint32_t menu_entries_show_back(void)
return (menu_list_get_stack_size(menu->menu_list) > 1); return (menu_list_get_stack_size(menu->menu_list) > 1);
} }
// Clicks the back button /* Clicks the back button */
void menu_entries_select_back(void) int menu_entries_select_back(void)
{ {
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list) if (!menu_list)
return; return -1;
menu_apply_deferred_settings(); menu_apply_deferred_settings();
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list);
return 0;
} }
// Sets title_msg to the name of the current core (shown at the top of the UI) // Sets title_msg to the name of the current core (shown at the top of the UI)

View File

@ -55,7 +55,7 @@ void menu_entries_get_title(char *title, size_t title_len);
uint32_t menu_entries_show_back(void); uint32_t menu_entries_show_back(void);
void menu_entries_select_back(void); int menu_entries_select_back(void);
void menu_entries_get_core_title(char *title_msg, size_t title_msg_len); void menu_entries_get_core_title(char *title_msg, size_t title_msg_len);