diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-03-08 11:02:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 11:02:20 +0100 |
| commit | 489d90b6f34bb526a2588545bc53d7a41531de9a (patch) | |
| tree | aba079785ffd67ec478bd23ad7a7a3198eb06b9a /Source/Android/jni/MainAndroid.cpp | |
| parent | 9c1eac1f4f8231ee024fa9c3679e89f768dafa99 (diff) | |
| parent | 459a5ab554af24c8e2c1978d02444bac5aa85e3f (diff) | |
Merge pull request #4999 from stenzek/renderer-statics
VideoCommon: Eliminate static state in Renderer
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 158d63a72c..4ca2f9c3f9 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -484,8 +484,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulatio jobject obj) { std::lock_guard<std::mutex> guard(s_host_identity_lock); - Core::SaveScreenShot("thumb"); - Renderer::s_screenshotCompleted.WaitFor(std::chrono::seconds(2)); + Core::SaveScreenShot("thumb", true); Core::Stop(); updateMainFrameEvent.Set(); // Kick the waiting event } |
