From 165cc2a8f0bc5ed50c83b2cdc3c574fe62ba57c5 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 19 Nov 2021 17:42:56 +0100
Subject: [PATCH] Fix back key not being intercepted

---
 .../java/net/kdt/pojavlaunch/BaseMainActivity.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 5a8561e7b..da01d324d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -350,10 +350,12 @@ public class BaseMainActivity extends LoggableActivity {
     }
 
     @Override
-    public void onBackPressed() {
-        // Prevent back
-        // Catch back as Esc keycode at another place
-        sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_ESCAPE);
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && !touchCharInput.isEnabled()) {
+            sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_ESCAPE);
+            return true;
+        }
+        return super.dispatchKeyEvent(event);
     }
 
     public static void switchKeyboardState() {