diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-03-17 16:14:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-17 16:14:56 +0100 |
| commit | c964d552c91f4d286c978e33a60702b43c60a467 (patch) | |
| tree | 24e056dbd4cff3ae8bd76dce4aa55f935308477e /Source/Android/jni/MainAndroid.cpp | |
| parent | 0bfa64bd742be43355f6e9f07176b6444b318944 (diff) | |
| parent | fe61efcd7a6539db9820c583de5c4ad2518769a6 (diff) | |
Merge pull request #12616 from mitaclaw/dvd-interface-cpu-thread-guard
DVDInterface: Modernize With CPUThreadGuard
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 827b535c8f..1ea795de0b 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -635,7 +635,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ChangeDisc(J HostThreadLock guard; const std::string path = GetJString(env, jFile); __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Change Disc: %s", path.c_str()); - Core::RunAsCPUThread([&path] { Core::System::GetInstance().GetDVDInterface().ChangeDisc(path); }); + auto& system = Core::System::GetInstance(); + system.GetDVDInterface().ChangeDisc(Core::CPUThreadGuard{system}, path); } JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetLogTypeNames(JNIEnv* env, |