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

Go through rarch_main_command instead of directly manipulating

Browse Source 
g_extern.lifecycle_state
This commit is contained in:
twinaphex 2014-09-03 16:55:56 +02:00
parent 18b6ca3bf3
commit 74ddc9c3b7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/menu/menu_common.c
View File

@ -205,8 +205,7 @@ bool load_menu_content(void)
driver.menu_ctx->backend->shader_manager_init(driver.menu); driver.menu_ctx->backend->shader_manager_init(driver.menu);
rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO); rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO);
rarch_main_command(RARCH_CMD_RESUME);
g_extern.lifecycle_state |= (1ULL << MODE_GAME);
return true; return true;
} }
@ -393,7 +392,7 @@ bool menu_iterate(void)
if (input_key_pressed_func(RARCH_QUIT_KEY) if (input_key_pressed_func(RARCH_QUIT_KEY)
|| !driver.video->alive(driver.video_data)) || !driver.video->alive(driver.video_data))
{ {
g_extern.lifecycle_state |= (1ULL << MODE_GAME); rarch_main_command(RARCH_CMD_RESUME);
return false; return false;
} }

6
retroarch.c
View File

@ -3318,7 +3318,7 @@ void rarch_main_command(unsigned cmd)
return; return;
#endif #endif
main_state(cmd); main_state(cmd);
g_extern.lifecycle_state |= (1ULL << MODE_GAME); rarch_main_command(RARCH_CMD_RESUME);
break; break;
case RARCH_CMD_RESET: case RARCH_CMD_RESET:
RARCH_LOG(RETRO_LOG_RESETTING_CONTENT); RARCH_LOG(RETRO_LOG_RESETTING_CONTENT);
@ -3328,14 +3328,14 @@ void rarch_main_command(unsigned cmd)
/* bSNES since v073r01 resets controllers to JOYPAD /* bSNES since v073r01 resets controllers to JOYPAD
* after a reset, so just enforce it here. */ * after a reset, so just enforce it here. */
init_controllers(); init_controllers();
g_extern.lifecycle_state |= (1ULL << MODE_GAME); rarch_main_command(RARCH_CMD_RESUME);
break; break;
case RARCH_CMD_SAVE_STATE: case RARCH_CMD_SAVE_STATE:
if (g_settings.savestate_auto_index) if (g_settings.savestate_auto_index)
g_settings.state_slot++; g_settings.state_slot++;
main_state(cmd); main_state(cmd);
g_extern.lifecycle_state |= (1ULL << MODE_GAME); rarch_main_command(RARCH_CMD_RESUME);
break; break;
case RARCH_CMD_TAKE_SCREENSHOT: case RARCH_CMD_TAKE_SCREENSHOT:
take_screenshot(); take_screenshot();