From a1822055b6c25959c26afb9a03ed4c177ac4fb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Thu, 31 Aug 2017 21:27:14 -0300 Subject: [PATCH] (menu_cbs) Don't compare labels when menu entry comes from playlist --- menu/cbs/menu_cbs_deferred_push.c | 4 ++-- menu/cbs/menu_cbs_title.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index f6f58b49fa..e1485aa237 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -1759,8 +1759,8 @@ int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_default); - if (menu_cbs_init_bind_deferred_push_compare_label( - cbs, label, label_hash) == 0) + if (cbs->enum_idx != MENU_ENUM_LABEL_PLAYLIST_ENTRY && + menu_cbs_init_bind_deferred_push_compare_label(cbs, label, label_hash) == 0) return 0; if (menu_cbs_init_bind_deferred_push_compare_type( diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 0930db8e2b..4e67035d0b 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -1105,7 +1105,8 @@ int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_title_default); - if (menu_cbs_init_bind_title_compare_label(cbs, label, label_hash) == 0) + if (cbs->enum_idx != MENU_ENUM_LABEL_PLAYLIST_ENTRY && + menu_cbs_init_bind_title_compare_label(cbs, label, label_hash) == 0) return 0; if (menu_cbs_init_bind_title_compare_type(cbs, type) == 0)