From 0c9c66bf81ecb101b09167603c66bcbea3b0f762 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 7 Nov 2020 22:45:49 +1000
Subject: [PATCH] Android: End emulation activity if not valid on returning

---
 .../java/com/github/stenzek/duckstation/EmulationActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
index cad4ad342..bdc742828 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
@@ -235,9 +235,8 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (!AndroidHostInterface.hasInstanceAndEmulationThreadIsRunning()) {
+        if (!checkActivityIsValid()) {
             // we must've got killed off in the background :(
-            finish();
             return;
         }