From 4f493c8e21f43dd6e4ce6eed26b9bfcae1c143e9 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Fri, 8 May 2015 15:06:28 +0200 Subject: [PATCH] (CocoaTouch) get_core_title - use menu_list_get_ptr --- ui/drivers/cocoa/cocoatouch_menu.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index e3bec7ad54..9296905e2c 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -803,12 +803,13 @@ void get_core_title(char *title_msg, size_t title_msg_len) unsigned type = 0, w = 0; const char *dir = NULL; const char *label = NULL; + menu_list_t *menu_list = menu_list_get_ptr(); unsigned menu_type = 0; weakSelf = self; - menu_list_get_last_stack(menu->menu_list, &dir, &label, &menu_type); + menu_list_get_last_stack(menu_list, &dir, &label, &menu_type); - menu_list_get_at_offset(menu->menu_list->selection_buf, i, &path, + menu_list_get_at_offset(menu_list->selection_buf, i, &path, &entry_label, &type); // JM: Ideally, this would be simpler because RA would provide a @@ -818,7 +819,7 @@ void get_core_title(char *title_msg, size_t title_msg_len) setting = setting_find_setting (menu->list_settings, - menu->menu_list->selection_buf->list[i].label); + menu_list->selection_buf->list[i].label); if (setting_is_of_path_type(setting)) { @@ -867,12 +868,12 @@ void get_core_title(char *title_msg, size_t title_msg_len) else { // This is for ST_GROUP/etc cbs = (menu_file_list_cbs_t*) - menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf, i); + menu_list_get_actiondata_at_offset(menu_list->selection_buf, i); if (cbs && cbs->action_get_representation) { cbs->action_get_representation - (menu->menu_list->selection_buf, + (menu_list->selection_buf, &w, type, i, label, type_str, sizeof(type_str), entry_label, path,