Android: Fix ANR when boot fails

pull/956/head
Connor McLaughlin 5 years ago
parent 897f2dadf8
commit 423054e8ac

@ -194,7 +194,9 @@ void AndroidHostInterface::PauseEmulationThread(bool paused)
void AndroidHostInterface::StopEmulationThread()
{
Assert(IsEmulationThreadRunning());
if (!IsEmulationThreadRunning())
return;
Log_InfoPrint("Stopping emulation thread...");
{
std::unique_lock<std::mutex> lock(m_mutex);

@ -100,6 +100,7 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
public void onEmulationStopped() {
runOnUiThread(() -> {
AndroidHostInterface.getInstance().stopEmulationThread();
if (!mWasDestroyed)
finish();
});

Loading…
Cancel
Save