From 0df401b164bbe2b0314b74f1fd6385e852bbe098 Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:33:55 -0700 Subject: Core::IsRunning: Avoid Global System Accessor --- Source/Android/jni/MainAndroid.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Android/jni/MainAndroid.cpp') diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 1034406d7a..7f7cf66ccc 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -118,7 +118,7 @@ void Host_Message(HostMessageID id) } else if (id == HostMessageID::WMUserStop) { - if (Core::IsRunning()) + if (Core::IsRunning(Core::System::GetInstance())) Core::QueueHostJob(&Core::Stop); } } @@ -272,7 +272,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetIsBooting JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunning(JNIEnv*, jclass) { - return s_is_booting.IsSet() || static_cast(Core::IsRunning()); + return s_is_booting.IsSet() || + static_cast(Core::IsRunning(Core::System::GetInstance())); } JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunningAndStarted(JNIEnv*, @@ -589,7 +590,7 @@ static void Run(JNIEnv* env, std::unique_ptr&& boot, bool riivol s_need_nonblocking_alert_msg = false; surface_guard.unlock(); - while (Core::IsRunning()) + while (Core::IsRunning(Core::System::GetInstance())) { host_identity_guard.Unlock(); s_update_main_frame_event.Wait(); -- cgit v1.2.3