From c360b41a79ff4f3c6e84f976687fafca1c5b3b21 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 13 Sep 2020 14:37:28 +1000
Subject: [PATCH] Android: Fix settings activity back button stopping emulation

---
 .../github/stenzek/duckstation/SettingsActivity.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java
index 3ebf70f66..e2ad55966 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java
@@ -1,7 +1,9 @@
 package com.github.stenzek.duckstation;
 
 import android.os.Bundle;
+import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceFragmentCompat;
@@ -22,6 +24,16 @@ public class SettingsActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
     public static class SettingsFragment extends PreferenceFragmentCompat {
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {