ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Qt/companion UI) Driver check for ui_companion_driver comes too early inside 

of menu_setting.c - have to move the check to menu_displaylist.c
instead - this fixes 'User Interface' in Qt desktop menu - was
crashing
This commit is contained in:
twinaphex 2019-07-21 14:10:51 +02:00
parent 35aa4191ac
commit 1fe213de8c
2 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
menu/menu_displaylist.c
View File

@ -3455,6 +3455,12 @@ typedef struct menu_displaylist_build_info {
enum menu_displaylist_parse_type parse_type; enum menu_displaylist_parse_type parse_type;
} menu_displaylist_build_info_t; } menu_displaylist_build_info_t;
typedef struct menu_displaylist_build_info_selective {
enum msg_hash_enums enum_idx;
enum menu_displaylist_parse_type parse_type;
bool checked;
} menu_displaylist_build_info_selective_t;
unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ctl_state type) unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ctl_state type)
{ {
unsigned i; unsigned i;
@ -4079,7 +4085,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
break; break;
case DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST: case DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST:
{ {
menu_displaylist_build_info_t build_list[] = { menu_displaylist_build_info_selective_t build_list[] = {
{MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS, PARSE_ACTION }, {MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS, PARSE_ACTION },
{MENU_ENUM_LABEL_MENU_SETTINGS, PARSE_ACTION }, {MENU_ENUM_LABEL_MENU_SETTINGS, PARSE_ACTION },
{MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS, PARSE_ONLY_BOOL },
@ -4094,10 +4100,10 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
{MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE, PARSE_ONLY_BOOL },
{MENU_ENUM_LABEL_PAUSE_NONACTIVE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_PAUSE_NONACTIVE, PARSE_ONLY_BOOL },
{MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION, PARSE_ONLY_BOOL },
{MENU_ENUM_LABEL_UI_COMPANION_ENABLE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_UI_COMPANION_ENABLE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT, PARSE_ONLY_BOOL },
{MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_UI_COMPANION_TOGGLE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_UI_COMPANION_TOGGLE, PARSE_ONLY_BOOL },
{MENU_ENUM_LABEL_VIDEO_3DS_DISPLAY_MODE, PARSE_ONLY_UINT }, {MENU_ENUM_LABEL_VIDEO_3DS_DISPLAY_MODE, PARSE_ONLY_UINT },
{MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM, PARSE_ONLY_BOOL },
@ -4105,7 +4111,12 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
for (i = 0; i < ARRAY_SIZE(build_list); i++) for (i = 0; i < ARRAY_SIZE(build_list); i++)
{ {
if (menu_displaylist_parse_settings_enum(list, bool parse_setting = true;
if (build_list[i].checked &&
string_is_equal(ui_companion_driver_get_ident(), "null"))
parse_setting = false;
if (parse_setting &&
menu_displaylist_parse_settings_enum(list,
build_list[i].enum_idx, build_list[i].parse_type, build_list[i].enum_idx, build_list[i].parse_type,
false) == 0) false) == 0)
count++; count++;

152
menu/menu_setting.c
View File

@ -13138,94 +13138,82 @@ static bool setting_append_list(
SD_FLAG_NONE); SD_FLAG_NONE);
#endif #endif
if (string_is_not_equal(ui_companion_driver_get_ident(), "null")) CONFIG_BOOL(
{ list, list_info,
CONFIG_BOOL( &settings->bools.ui_companion_enable,
list, list_info, MENU_ENUM_LABEL_UI_COMPANION_ENABLE,
&settings->bools.ui_companion_enable, MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
MENU_ENUM_LABEL_UI_COMPANION_ENABLE, ui_companion_enable,
MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE, MENU_ENUM_LABEL_VALUE_OFF,
ui_companion_enable, MENU_ENUM_LABEL_VALUE_ON,
MENU_ENUM_LABEL_VALUE_OFF, &group_info,
MENU_ENUM_LABEL_VALUE_ON, &subgroup_info,
&group_info, parent_group,
&subgroup_info, general_write_handler,
parent_group, general_read_handler,
general_write_handler, SD_FLAG_ADVANCED);
general_read_handler,
SD_FLAG_ADVANCED);
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.ui_companion_start_on_boot, &settings->bools.ui_companion_start_on_boot,
MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT, MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT,
MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT, MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
ui_companion_start_on_boot, ui_companion_start_on_boot,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_ADVANCED); SD_FLAG_ADVANCED);
}
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) CONFIG_BOOL(
#else list, list_info,
if (string_is_not_equal(ui_companion_driver_get_ident(), "null")) &settings->bools.ui_menubar_enable,
#endif MENU_ENUM_LABEL_UI_MENUBAR_ENABLE,
{ MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
CONFIG_BOOL( DEFAULT_UI_MENUBAR_ENABLE,
list, list_info, MENU_ENUM_LABEL_VALUE_OFF,
&settings->bools.ui_menubar_enable, MENU_ENUM_LABEL_VALUE_ON,
MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, &group_info,
MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE, &subgroup_info,
DEFAULT_UI_MENUBAR_ENABLE, parent_group,
MENU_ENUM_LABEL_VALUE_OFF, general_write_handler,
MENU_ENUM_LABEL_VALUE_ON, general_read_handler,
&group_info, SD_FLAG_NONE);
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
}
if (string_is_not_equal(ui_companion_driver_get_ident(), "null"))
{
#ifdef HAVE_QT #ifdef HAVE_QT
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.desktop_menu_enable, &settings->bools.desktop_menu_enable,
MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE, MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE,
MENU_ENUM_LABEL_VALUE_DESKTOP_MENU_ENABLE, MENU_ENUM_LABEL_VALUE_DESKTOP_MENU_ENABLE,
desktop_menu_enable, desktop_menu_enable,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.ui_companion_toggle, &settings->bools.ui_companion_toggle,
MENU_ENUM_LABEL_UI_COMPANION_TOGGLE, MENU_ENUM_LABEL_UI_COMPANION_TOGGLE,
MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE, MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE,
ui_companion_toggle, ui_companion_toggle,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
#endif #endif
}
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group);