diff options
| author | Jules Blok <jules.blok@gmail.com> | 2016-11-11 20:30:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 20:30:31 +0100 |
| commit | f0ce3275afacbb8b61656f6d64216efee1dc2958 (patch) | |
| tree | 2b22d1c4ac8caefafea4abb4abc1d8c2ef96d41b /Source/Android/jni/MainAndroid.cpp | |
| parent | fbfce2a043394ecbd6da7affd6184a640e858d29 (diff) | |
| parent | 20d49ba97f14649c459f5311bf6325daebfa382a (diff) | |
Merge pull request #4439 from Armada651/yield-ui
CPU: Fix deadlocks by periodically yielding to the UI message pump.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index d2fdf30bb6..4cd975fae8 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -148,6 +148,10 @@ void Host_ShowVideoConfig(void*, const std::string&) { } +void Host_YieldToUI() +{ +} + static bool MsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/) { __android_log_print(ANDROID_LOG_ERROR, DOLPHIN_TAG, "%s:%s", caption, text); |