From eb92d6f0a8c930692de64bd41c5ddee403771023 Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Thu, 28 Mar 2024 11:35:13 -0700 Subject: Core::GetState: Avoid Global System Accessor --- Source/Android/jni/MainAndroid.cpp | 6 +++--- 1 file changed, 3 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 e07b1bd275..ebd0b2c792 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -283,7 +283,7 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunnin JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunningAndUnpaused(JNIEnv*, jclass) { - return static_cast(Core::GetState() == Core::State::Running); + return static_cast(Core::GetState(Core::System::GetInstance()) == Core::State::Running); } JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env, @@ -458,7 +458,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceDestr host_identity_guard.Lock(); } - if (Core::GetState() == Core::State::Running) + if (Core::GetState(Core::System::GetInstance()) == Core::State::Running) Core::SetState(Core::State::Paused); } @@ -572,7 +572,7 @@ static void Run(JNIEnv* env, std::unique_ptr&& boot, bool riivol if (BootManager::BootCore(Core::System::GetInstance(), std::move(boot), wsi)) { static constexpr int WAIT_STEP = 25; - while (Core::GetState() == Core::State::Starting) + while (Core::GetState(Core::System::GetInstance()) == Core::State::Starting) std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_STEP)); } -- cgit v1.2.3