Skip to content

Commit

Permalink
Android: Don't get a screenshot on exit
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 e3ae222 commit 87e416f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Source/Core/DolphinWX/MainAndroid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,9 @@ 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();
// Don't trigger a savescreen as this will block for "one frame", sounds less, but sometimes the emulation did crash ....
//Core::SaveScreenShot("thumb");
//Renderer::s_screenshotCompleted.Wait();
Core::Stop();
updateMainFrameEvent.Set(); // Kick the waiting event
}
Expand Down

0 comments on commit 87e416f

Please sign in to comment.