mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move code to load_menu_content

Browse Source
This commit is contained in:
twinaphex 2014-08-02 18:41:43 +02:00
parent 8abb916f66
commit 671be27367
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/frontend.c
View File

@ -115,13 +115,7 @@ static int main_entry_iterate_content(args_type() args)
static int main_entry_iterate_load_content(args_type() args) static int main_entry_iterate_load_content(args_type() args)
{ {
if (load_menu_content()) if (!load_menu_content())
{
g_extern.lifecycle_state |= (1ULL << MODE_GAME);
if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio)
driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
}
else
{ {
#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE) #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
// If ROM load fails, we go back to menu. // If ROM load fails, we go back to menu.

5
frontend/menu/menu_common.c
View File

@ -222,6 +222,11 @@ bool load_menu_content(void)
if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_init) if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_init)
driver.menu_ctx->backend->shader_manager_init(driver.menu); driver.menu_ctx->backend->shader_manager_init(driver.menu);
if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio)
driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
g_extern.lifecycle_state |= (1ULL << MODE_GAME);
return true; return true;
} }