From 4bcf8b3ce945cf10c2c9de7c2220105fac4d5af5 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Mon, 14 Dec 2020 02:13:19 +1000
Subject: [PATCH] Android: Fix nav/notification bar getting stuck when editing
 layout

---
 .../com/github/stenzek/duckstation/EmulationActivity.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 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 38a2e965b..5d531d170 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
@@ -430,12 +430,10 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
 
                 case 5:     // Edit Touchscreen Controller Layout
                 {
-                    if (mTouchscreenController != null) {
+                    if (mTouchscreenController != null)
                         mTouchscreenController.startLayoutEditing();
-                    } else {
-                        Toast.makeText(this, R.string.emulation_activity_touchscreen_controller_not_active, Toast.LENGTH_SHORT);
-                    }
 
+                    onMenuClosed();
                     return;
                 }
             }