Merge pull request #5591 from orbea/cli

Fix regressions from commit 538d51553c77ed22963eb0533c29b38af466ad55.
This commit is contained in:
Twinaphex 2017-10-23 15:23:41 +02:00 committed by GitHub
commit 86ff1995b3

View File

@ -912,7 +912,8 @@ static bool task_load_content(content_ctx_info_t *content_info,
#ifdef HAVE_MENU
/* Push quick menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
if (launched_from_cli)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
if (info && !string_is_empty(tmp))