diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-03-22 04:13:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 04:13:01 +0100 |
| commit | f8fdaf9b94a152723153b8bf27b00f31107f27c7 (patch) | |
| tree | 288ef93020a141a285e9b1afa5bbc47802f27b8c /Source/Android/jni/MainAndroid.cpp | |
| parent | 4f3b4471f2fe2405d3fdd6b7f8d2baa4fcb4a4a1 (diff) | |
| parent | f09b71582ee357ef47f8608a5b0fd848e404b453 (diff) | |
Merge pull request #12648 from mitaclaw/core-global-system
Core: Avoid (Some) Global System Accessor
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 1ea795de0b..455f5f30af 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -258,7 +258,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulati JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv*, jclass) { HostThreadLock guard; - Core::Stop(); + Core::Stop(Core::System::GetInstance()); // Kick the waiting event s_update_main_frame_event.Set(); @@ -586,11 +586,11 @@ static void Run(JNIEnv* env, std::unique_ptr<BootParameters>&& boot, bool riivol host_identity_guard.Unlock(); s_update_main_frame_event.Wait(); host_identity_guard.Lock(); - Core::HostDispatchJobs(); + Core::HostDispatchJobs(Core::System::GetInstance()); } s_game_metadata_is_valid = false; - Core::Shutdown(); + Core::Shutdown(Core::System::GetInstance()); host_identity_guard.Unlock(); env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), |