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

36
frontend/menu/menu_common.c
View File

@ -83,31 +83,31 @@ 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) char tmp[PATH_MAX];
{ char str[PATH_MAX];
char tmp[PATH_MAX];
char str[PATH_MAX];
fill_pathname_base(tmp, g_extern.fullpath, sizeof(tmp)); fill_pathname_base(tmp, g_extern.fullpath, sizeof(tmp));
snprintf(str, sizeof(str), "INFO - Loading %s ...", tmp); snprintf(str, sizeof(str), "INFO - Loading %s ...", tmp);
msg_queue_push(g_extern.msg_queue, str, 1, 1); msg_queue_push(g_extern.msg_queue, str, 1, 1);
}
content_playlist_push(g_extern.history,
g_extern.fullpath,
g_settings.libretro,
g_extern.menu.info.library_name);
} }
content_playlist_push(g_extern.history,
g_extern.fullpath,
g_settings.libretro,
g_extern.menu.info.library_name);
} }
/* redraw menu frame */ /* redraw menu frame */
driver.menu->old_input_state = driver.menu->trigger_state = 0; if (driver.menu)
driver.menu->do_held = false; {
driver.menu->msg_force = true; driver.menu->old_input_state = driver.menu->trigger_state = 0;
driver.menu->do_held = false;
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)