summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/MainAndroid.cpp
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2015-09-05 11:36:16 +0200
committerdegasus <wickmarkus@web.de>2015-09-05 15:29:22 +0200
commit9187200de3b69fb74b20d93693a84ee2f446b0a8 (patch)
tree6349df8ee2637a742d68c1d15d4c6d63b47517db /Source/Core/DolphinWX/MainAndroid.cpp
parent24fec3ebca40a8adf187065e32adf6edea2e5919 (diff)
Android: Abort the screenshot after 2 seconds
If the emulation is crashed, this blocks forever. So there is no way to exit the emulation within a finite time.
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
-rw-r--r--Source/Core/DolphinWX/MainAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index 1d48f5c103..1f6edfe6b3 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -397,7 +397,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulati
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj)
{
Core::SaveScreenShot("thumb");
- Renderer::s_screenshotCompleted.Wait();
+ Renderer::s_screenshotCompleted.WaitFor(std::chrono::seconds(2));
Core::Stop();
updateMainFrameEvent.Set(); // Kick the waiting event
}