Don't rely on 'value' setting

This commit is contained in:
twinaphex 2016-06-17 20:15:35 +02:00
parent f7f56edffd
commit b606d47622
6 changed files with 14 additions and 1 deletions

View File

@ -569,6 +569,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
if ( string_is_equal(menu_label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB)) ||
string_is_equal(menu_label, menu_hash_to_str_enum(MENU_ENUM_LABEL_PLAYLISTS_TAB)) ||
string_is_equal(menu_label, menu_hash_to_str_enum(MENU_ENUM_LABEL_ADD_TAB)) ||
string_is_equal(menu_label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HORIZONTAL_MENU)) ||
string_is_equal(menu_label, menu_hash_to_str_enum(MENU_ENUM_LABEL_SETTINGS_TAB))
)
{

View File

@ -283,6 +283,8 @@ static int action_get_title_group_settings(const char *path, const char *label,
strlcpy(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB), len);
else if (string_is_equal(label, menu_hash_to_str_enum(MENU_ENUM_LABEL_ADD_TAB)))
strlcpy(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ADD_TAB), len);
else if (string_is_equal(label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HORIZONTAL_MENU)))
strlcpy(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU), len);
else
{
char elem0[PATH_MAX_LENGTH] = {0};

View File

@ -3002,7 +3002,7 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action
break;
default:
menu_stack->list[stack_size - 1].label =
strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU));
strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_HORIZONTAL_MENU));
menu_stack->list[stack_size - 1].type =
MENU_SETTING_HORIZONTAL_MENU;
break;

View File

@ -34,6 +34,8 @@ static const char *menu_hash_to_str_us_label_enum(enum menu_hash_enums msg)
return "add_tab";
case MENU_ENUM_LABEL_PLAYLISTS_TAB:
return "playlists_tab";
case MENU_ENUM_LABEL_HORIZONTAL_MENU:
return "horizontal_menu";
case MENU_ENUM_LABEL_PARENT_DIRECTORY:
return "parent_directory";
case MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE:

View File

@ -3555,6 +3555,12 @@ static bool menu_displaylist_push_internal(
return false;
return true;
}
else if (string_is_equal(label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HORIZONTAL_MENU)))
{
if (!menu_displaylist_ctl(DISPLAYLIST_HORIZONTAL, info))
return false;
return true;
}
switch (menu_hash_calculate(label))
{

View File

@ -723,6 +723,8 @@ enum menu_hash_enums
MENU_ENUM_LABEL_VALUE_SHA1,
MENU_ENUM_LABEL_VALUE_CRC,
MENU_ENUM_LABEL_VALUE_MORE,
MENU_ENUM_LABEL_HORIZONTAL_MENU,
MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU,
MENU_ENUM_LABEL_SETTINGS_TAB,