Merge pull request #5583 from orbea/cli

When starting content from the cli open the quick menu.
This commit is contained in:
Twinaphex 2017-10-22 18:28:33 +02:00 committed by GitHub
commit 85f8823d05

View File

@ -910,6 +910,11 @@ static bool task_load_content(content_ctx_info_t *content_info,
PATH_MAX_LENGTH * sizeof(char)); PATH_MAX_LENGTH * sizeof(char));
} }
#ifdef HAVE_MENU
/* Push quick menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
if (info && !string_is_empty(tmp)) if (info && !string_is_empty(tmp))
{ {
const char *core_path = NULL; const char *core_path = NULL;
@ -1577,8 +1582,8 @@ bool task_push_load_content_with_new_core_from_companion_ui(
if (!task_load_content_callback(content_info, true, false)) if (!task_load_content_callback(content_info, true, false))
return false; return false;
/* Push quick menu onto menu stack */
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Push quick menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif #endif