libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-15 06:58:34 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Don't abuse g_extern.lifecycle_state for setting RARCH_QUIT_KEY

Browse Source 
anymore
This commit is contained in:
twinaphex 2014-06-02 09:52:30 +02:00
parent a26bb62a56
commit 26b62ba42e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/native/jni/input_android.c
View File

@ -1736,7 +1736,7 @@ static void android_input_set_keybinds(void *data, unsigned device,
static void android_input_poll(void *data)
{
int ident;
uint64_t lifecycle_mask = (1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_MENU_TOGGLE);
uint64_t lifecycle_mask = (1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_MENU_TOGGLE);
uint64_t *lifecycle_state = &g_extern.lifecycle_state;
struct android_app *android_app = (struct android_app*)g_android;
android_input_t *android = (android_input_t*)data;
@ -1824,7 +1824,7 @@ static void android_input_poll(void *data)
}
else if (g_settings.input.back_behavior == BACK_BUTTON_QUIT)
{
*lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
g_extern.system.shutdown = true;
AInputQueue_finishEvent(android_app->inputQueue, event, handled);
break;
}

2
blackberry-qnx/qnx_input.c
View File

@ -509,7 +509,7 @@ static void handle_navigator_event(void *data, bps_event_t *event)
}
else if (bps_event_get_code(event_pause) == NAVIGATOR_EXIT)
{
g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
g_extern.system.shutdown = true;
break;
}
}

2
gfx/context/androidegl_ctx.c
View File

@ -182,7 +182,7 @@ static void gfx_ctx_check_window(void *data, bool *quit,
}
// Check if we are exiting.
if (g_extern.lifecycle_state & (1ULL << RARCH_QUIT_KEY))
if (g_extern.system.shutdown)
*quit = true;
}

2
gfx/context/bbqnx_ctx.c
View File

@ -311,7 +311,7 @@ static void gfx_ctx_qnx_check_window(void *data, bool *quit,
}
// Check if we are exiting.
if (g_extern.lifecycle_state & (1ULL << RARCH_QUIT_KEY))
if (g_extern.system.shutdown)
*quit = true;
}