diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index 34805fda75..bb2e47cf63 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -142,29 +142,26 @@ static void android_input_poll(void *data) uint8_t unpacked = (keycode_lut[AKEYCODE_BACK] >> ((state_id+1) << 3)) - 1; uint64_t input_state = (1ULL << unpacked); - if (type_event == AINPUT_EVENT_TYPE_KEY && input_state < (1ULL << RARCH_FIRST_META_KEY) - && input_state > 0) + if (g_extern.lifecycle_mode_state & (1ULL << MODE_INPUT_XPERIA_PLAY_HACK)) { - } - else - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INPUT_XPERIA_PLAY_HACK)) - { - int meta = AKeyEvent_getMetaState(event); - if (!(meta & AMETA_ALT_ON)) - { - *lifecycle_state |= (1ULL << RARCH_QUIT_KEY); - AInputQueue_finishEvent(android_app->inputQueue, event, handled); - break; - } - } - else + int meta = AKeyEvent_getMetaState(event); + if (!(meta & AMETA_ALT_ON)) { *lifecycle_state |= (1ULL << RARCH_QUIT_KEY); AInputQueue_finishEvent(android_app->inputQueue, event, handled); break; } } + else if (type_event == AINPUT_EVENT_TYPE_KEY && input_state < (1ULL << RARCH_FIRST_META_KEY) + && input_state > 0) + { + } + else + { + *lifecycle_state |= (1ULL << RARCH_QUIT_KEY); + AInputQueue_finishEvent(android_app->inputQueue, event, handled); + break; + } } if (type_event == AINPUT_EVENT_TYPE_MOTION) diff --git a/android/phoenix/assets/libretro_cores.cfg b/android/phoenix/assets/libretro_cores.cfg index 559b8ce895..f1de8dacc0 100644 --- a/android/phoenix/assets/libretro_cores.cfg +++ b/android/phoenix/assets/libretro_cores.cfg @@ -13,3 +13,4 @@ libretro_nestopia = "Nestopia (Nintendo NES)" libretro_pcsx_rearmed-neon = "PCSX-reARMed (PlayStation1) [NEON]" libretro_pcsx_rearmed = "PCSX-reARMed (PlayStation1)" libretro_nxengine = "NXEngine (Cave Story/Doukutsu Monogatari)" +libretro_tyrquake = "TyrQuake (Quake 1)"