diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-09-05 08:43:44 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-09-05 08:43:44 -0500 |
| commit | de80b9e98868733754f4f87c9d85643d2dc6696c (patch) | |
| tree | 70c3a625f7297515bcffa563449fc64b83f06ab2 /Source/Core/DolphinWX/MainAndroid.cpp | |
| parent | a47bbee02a3d8f6f585961c15ba9e6727a64df49 (diff) | |
| parent | 9187200de3b69fb74b20d93693a84ee2f446b0a8 (diff) | |
Merge pull request #2971 from degasus/arm
JitArm64: fix smaller issues
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainAndroid.cpp | 2 |
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 } |