From 5a5d58d8e855fdfe6886f2a0168d7159d4bf7f62 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 3 Sep 2014 16:58:20 +0200 Subject: [PATCH] Refactor more direct manipulation of g_extern.lifecycle_state --- frontend/menu/backend/menu_common_backend.c | 2 +- frontend/menu/backend/menu_lakka_backend.c | 4 +++- frontend/menu/disp/lakka.c | 2 +- frontend/menu/disp/rmenu_xui.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index f5496d7f56..46982951a7 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -1938,7 +1938,7 @@ static int menu_action_ok(const char *dir, fill_pathname_join(image, dir, path, sizeof(image)); rarch_disk_control_append_image(image); - g_extern.lifecycle_state |= 1ULL << MODE_GAME; + rarch_main_command(RARCH_CMD_RESUME); menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS); return -1; diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index 8a2e8bde61..c7b46e5f10 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -341,7 +341,9 @@ static int menu_lakka_iterate(unsigned action) global_alpha = 0.0; if (g_extern.main_is_init && !g_extern.libretro_dummy && strcmp(g_extern.fullpath, active_item->rom) == 0) - g_extern.lifecycle_state |= (1ULL << MODE_GAME); + { + rarch_main_command(RARCH_CMD_RESUME); + } else { strlcpy(g_extern.fullpath, active_item->rom, sizeof(g_extern.fullpath)); diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index d6446281fa..19956b4f12 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -1012,7 +1012,7 @@ static int lakka_input_postprocess(uint64_t old_state) !g_extern.libretro_dummy) { global_alpha = 0; - g_extern.lifecycle_state |= (1ULL << MODE_GAME); + rarch_main_command(RARCH_CMD_RESUME); return -1; } diff --git a/frontend/menu/disp/rmenu_xui.cpp b/frontend/menu/disp/rmenu_xui.cpp index ecd767a06c..942ca46570 100644 --- a/frontend/menu/disp/rmenu_xui.cpp +++ b/frontend/menu/disp/rmenu_xui.cpp @@ -356,7 +356,7 @@ static int rmenu_xui_input_postprocess(uint64_t old_state) if ((driver.menu->trigger_state & (1ULL << RARCH_MENU_TOGGLE)) && g_extern.main_is_init) { - g_extern.lifecycle_state |= (1ULL << MODE_GAME); + rarch_main_command(RARCH_CMD_RESUME); process_input_ret = -1; }