Skip to content

Commit

Permalink
Android: Abort the screenshot after 2 seconds
Browse files Browse the repository at this point in the history
If the emulation is crashed, this blocks forever. So there is no way to exit the emulation within a finite time.
  • Loading branch information
degasus committed Sep 5, 2015
1 parent 24fec3e commit 9187200
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/MainAndroid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 9187200

Please sign in to comment.