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

(iOS Thread) Make the pause menu's exit button work again

Browse Source
This commit is contained in:
meancoot 2013-04-03 12:08:27 -04:00
parent ca4921d6c0
commit 6d657d6fab
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/frontend_ios.c
View File

@ -94,7 +94,11 @@ void* rarch_main_ios(void* args)
for (;;)
{
if (g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
if (g_extern.system.shutdown)
{
break;
}
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
{
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate())
process_events();
@ -132,7 +136,7 @@ void* rarch_main_ios(void* args)
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
{
g_extern.lifecycle_mode_state |= 1ULL << MODE_MENU_PREINIT;
while (menu_iterate())
while (!g_extern.system.shutdown && menu_iterate())
process_events();
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
}
@ -140,6 +144,8 @@ void* rarch_main_ios(void* args)
break;
}
g_extern.system.shutdown = false;
menu_free();
if (g_extern.main_is_init)
rarch_main_deinit();

7
ios/RetroArch/RetroArch_iOS.m
View File

@ -52,6 +52,11 @@ static void event_set_state_slot(void* userdata)
g_extern.state_slot = (uint32_t)userdata;
}
static void event_quit(void* userdata)
{
g_extern.system.shutdown = true;
}
static void event_reload_config(void* userdata)
{
// Need to clear these otherwise stale versions may be used!
@ -255,7 +260,7 @@ static void event_reload_config(void* userdata)
- (IBAction)closeGamePressed:(id)sender
{
[self closePauseMenu:sender];
// [self closeGame];
ios_frontend_post_event(event_quit, 0);
}
- (IBAction)showSettings