From 3570ba80d2afeffe3e7adbed489a0b7a1a566403 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 18 Dec 2012 03:18:53 +0100 Subject: [PATCH] (Android) Move Android-specific pause functionality outside of rarch_main_iterate --- android/native/jni/main.c | 2 +- retroarch.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/android/native/jni/main.c b/android/native/jni/main.c index 53acc4d998..bb3d013bdb 100644 --- a/android/native/jni/main.c +++ b/android/native/jni/main.c @@ -443,7 +443,7 @@ static void* android_app_entry(void* param) RARCH_LOG("RetroArch started.\n"); rarch_init_msg_queue(); g_android.last_orient = AConfiguration_getOrientation(android_app->config); - while(rarch_main_iterate()); + while((input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ? android_run_events(g_android.app) : rarch_main_iterate()); RARCH_LOG("RetroArch stopped.\n"); } diff --git a/retroarch.c b/retroarch.c index 842b11f37c..8bded293a3 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2769,11 +2769,6 @@ bool rarch_main_iterate(void) return false; } -#ifdef ANDROID - if (input_key_pressed_func(RARCH_PAUSE_TOGGLE)) - return android_run_events(g_android.app); -#endif - // Time to drop? if (input_key_pressed_func(RARCH_QUIT_KEY) || !video_alive_func())