From 248c944ff8a8827cf579e2549e7f04edc8a70a89 Mon Sep 17 00:00:00 2001 From: orbea Date: Tue, 8 Jan 2019 22:55:32 -0800 Subject: [PATCH] Fix crash with the null menu driver and Qt frontend. When failing to load content in the Qt companion ui while using the null menu driver RetroArch will crash. Now it just prints that it failed to load content in the Qt ui. --- menu/cbs/menu_cbs_ok.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 33275572cd..e4e7941d0c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -281,12 +281,14 @@ int generic_action_ok_displaylist_push(const char *path, enum msg_hash_enums enum_idx = MSG_UNKNOWN; settings_t *settings = config_get_ptr(); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); + char *menu_driver = settings->arrays.menu_driver; menu_displaylist_info_init(&info); info.list = menu_stack; - if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) + if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu) || + string_is_equal(menu_driver, "null")) goto end; tmp[0] = '\0';