From 0a046eaaf761dcf8971f60cfe981acef99f4b294 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 6 Nov 2016 11:55:07 +0100 Subject: [PATCH] Turn menu_dialog_current_id into static variable again --- menu/cbs/menu_cbs_ok.c | 2 +- menu/widgets/menu_dialog.c | 7 ++++++- menu/widgets/menu_dialog.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 970424d02c..cd3d3431c0 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1506,7 +1506,7 @@ static int action_ok_cheevos(const char *path, { unsigned new_id = type - MENU_SETTINGS_CHEEVOS_START; - menu_dialog_current_id = new_id; + menu_dialog_set_current_id(new_id); return generic_action_ok_help(path, label, new_id, idx, entry_idx, MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION, diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c index 8bc25af169..f272685156 100644 --- a/menu/widgets/menu_dialog.c +++ b/menu/widgets/menu_dialog.c @@ -38,7 +38,7 @@ static bool menu_dialog_pending_push = false; static bool menu_dialog_active = false; -unsigned menu_dialog_current_id = 0; +static unsigned menu_dialog_current_id = 0; static enum menu_dialog_type menu_dialog_current_type = MENU_DIALOG_NONE; static enum msg_hash_enums menu_dialog_current_msg = MSG_UNKNOWN; @@ -300,6 +300,11 @@ void menu_dialog_push(void) menu_displaylist_ctl(DISPLAYLIST_HELP, &info); } +void menu_dialog_set_current_id(unsigned id) +{ + menu_dialog_current_id = id; +} + void menu_dialog_reset(void) { menu_dialog_pending_push = false; diff --git a/menu/widgets/menu_dialog.h b/menu/widgets/menu_dialog.h index 0d2975478f..560ed72589 100644 --- a/menu/widgets/menu_dialog.h +++ b/menu/widgets/menu_dialog.h @@ -68,6 +68,8 @@ void menu_dialog_show_message( bool menu_dialog_is_active(void); +void menu_dialog_set_current_id(unsigned id); + void menu_dialog_set_active(bool on); enum menu_dialog_type menu_dialog_get_current_type(void);