Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix ANR when boot fails

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-10 16:35:36 +10:00
parent 897f2dadf8
commit 423054e8ac
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/cpp/android_host_interface.cpp
View file

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

1
android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
View file

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