From 52c8040589fc36c149c234dcfe4d20448688e3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 23 Oct 2015 03:43:25 +0700 Subject: [PATCH] Add a type for empty message entries, fixes a bug in XMB --- menu/cbs/menu_cbs_left.c | 1 + menu/cbs/menu_cbs_right.c | 1 + menu/drivers/xmb.c | 5 ++--- menu/menu.h | 1 + menu/menu_displaylist.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index bc8dac4260..6d49179a98 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -461,6 +461,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs, case MENU_FILE_CONFIG: case MENU_FILE_USE_DIRECTORY: case MENU_FILE_PLAYLIST_ENTRY: + case MENU_INFO_MESSAGE: case MENU_FILE_DOWNLOAD_CORE: case MENU_FILE_CHEAT: case MENU_FILE_REMAP: diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 884761e61e..f9011a4170 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -411,6 +411,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs, case MENU_FILE_CONFIG: case MENU_FILE_USE_DIRECTORY: case MENU_FILE_PLAYLIST_ENTRY: + case MENU_INFO_MESSAGE: case MENU_FILE_DOWNLOAD_CORE: case MENU_FILE_CHEAT: case MENU_FILE_REMAP: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index f6d10a0052..88ccdc6d67 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1192,6 +1192,8 @@ static GRuint xmb_icon_get_id(xmb_handle_t *xmb, return xmb->textures.list[XMB_TEXTURE_SETTING].id; case MENU_SETTING_GROUP: return xmb->textures.list[XMB_TEXTURE_SETTING].id; + case MENU_INFO_MESSAGE: + return xmb->textures.list[XMB_TEXTURE_CORE_INFO].id; } return xmb->textures.list[XMB_TEXTURE_SUBSETTING].id; @@ -1280,9 +1282,6 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, case MENU_LABEL_CORE_OPTIONS: icon = xmb->textures.list[XMB_TEXTURE_CORE_OPTIONS].id; break; - case MENU_LABEL_CORE_INFORMATION: - icon = xmb->textures.list[XMB_TEXTURE_CORE_INFO].id; - break; case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS: icon = xmb->textures.list[XMB_TEXTURE_INPUT_REMAPPING_OPTIONS].id; break; diff --git a/menu/menu.h b/menu/menu.h index b13c3a9fd2..ab237d116b 100644 --- a/menu/menu.h +++ b/menu/menu.h @@ -117,6 +117,7 @@ typedef enum MENU_SETTING_GROUP, MENU_SETTING_SUBGROUP, MENU_SETTING_HORIZONTAL_MENU, + MENU_INFO_MESSAGE, MENU_FILE_TYPE_T_LAST } menu_file_type_t; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 962079001f..6ab4a5d53e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -853,7 +853,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info, menu_entries_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE), menu_hash_to_str(MENU_LABEL_NO_PLAYLIST_ENTRIES_AVAILABLE), - 0, 0, 0); + MENU_INFO_MESSAGE, 0, 0); return 0; }