diff options
| author | JosJuice <josjuice@gmail.com> | 2023-06-11 12:18:16 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2023-06-12 23:39:42 +0200 |
| commit | 3519a7070d5dc476cb1911bb1d2b05befbe0804b (patch) | |
| tree | 2726f8e77ee86370128285dff68872b0b292b18f /Source/Android/jni/MainAndroid.cpp | |
| parent | 552404292238bd1758346cc526827580aec4f532 (diff) | |
Android: And Lock and Unlock wrappers to HostThreadLock
This way we can ensure DeclareAsHostThread and UndeclareAsHostThread
are called when locking and unlocking.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index d99326aaae..0b8a0760ab 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -447,9 +447,9 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceDestr while (s_is_booting.IsSet()) { // Need to wait for boot to finish before we can pause - host_identity_guard.m_lock.unlock(); + host_identity_guard.Unlock(); std::this_thread::sleep_for(std::chrono::milliseconds(1)); - host_identity_guard.m_lock.lock(); + host_identity_guard.Lock(); } if (Core::GetState() == Core::State::Running) @@ -572,15 +572,15 @@ static void Run(JNIEnv* env, std::unique_ptr<BootParameters>&& boot, bool riivol while (Core::IsRunning()) { - host_identity_guard.m_lock.unlock(); + host_identity_guard.Unlock(); s_update_main_frame_event.Wait(); - host_identity_guard.m_lock.lock(); + host_identity_guard.Lock(); Core::HostDispatchJobs(); } s_game_metadata_is_valid = false; Core::Shutdown(); - host_identity_guard.m_lock.unlock(); + host_identity_guard.Unlock(); env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetFinishEmulationActivity()); |
