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

Refactor load_menu_content

This commit is contained in:
twinaphex 2014-09-12 01:11:14 +02:00
parent 4127d8c1a8
commit 2263f86b26
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/menu_common.c
View File

@ -83,9 +83,7 @@ static void menu_environment_get(int *argc, char *argv[],
bool load_menu_content(void) bool load_menu_content(void)
{ {
if (driver.menu) if (*g_extern.fullpath || (driver.menu && driver.menu->load_no_content))
{
if (*g_extern.fullpath || driver.menu->load_no_content)
{ {
if (*g_extern.fullpath) if (*g_extern.fullpath)
{ {
@ -102,12 +100,14 @@ bool load_menu_content(void)
g_settings.libretro, g_settings.libretro,
g_extern.menu.info.library_name); g_extern.menu.info.library_name);
} }
}
/* redraw menu frame */ /* redraw menu frame */
if (driver.menu)
{
driver.menu->old_input_state = driver.menu->trigger_state = 0; driver.menu->old_input_state = driver.menu->trigger_state = 0;
driver.menu->do_held = false; driver.menu->do_held = false;
driver.menu->msg_force = true; driver.menu->msg_force = true;
}
if (driver.menu_ctx && driver.menu_ctx->backend && if (driver.menu_ctx && driver.menu_ctx->backend &&
driver.menu_ctx->backend->iterate) driver.menu_ctx->backend->iterate)