diff options
| author | JosJuice <josjuice@gmail.com> | 2023-06-19 20:37:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 20:37:59 +0200 |
| commit | cff3e22f84b8335c8e0d110f9a202e5260d2b7b9 (patch) | |
| tree | 0cad62a340c5ca24789f6268bd16636400824499 /Source/Core | |
| parent | 5d7b5822c97285a1b45f54b2ae8046808cbe54d2 (diff) | |
| parent | f11175d117bd47edac8df56a96fea5b68fc3ef7e (diff) | |
Merge pull request #11926 from JosJuice/android-host-check
Android: Re-add host thread check
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Core.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index dbcca8a687..19bd249952 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -795,11 +795,8 @@ void SaveScreenShot(std::string_view name) static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unlock) { -// WARNING: PauseAndLock is not fully threadsafe so is only valid on the Host Thread -// TODO: Fix Android -#ifndef ANDROID + // WARNING: PauseAndLock is not fully threadsafe so is only valid on the Host Thread ASSERT(IsHostThread()); -#endif if (!IsRunningAndStarted()) return true; |