From 1dda4de9363921a2b00729b97ee0d3a0268f90f1 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Mon, 3 May 2021 21:07:19 +1000
Subject: [PATCH] Mobile: Fix can't close tab list if you press Tab on keyboard
 (Thanks aleksb385)

---
 src/Screens.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Screens.c b/src/Screens.c
index 7a88a0937..026ece543 100644
--- a/src/Screens.c
+++ b/src/Screens.c
@@ -331,7 +331,7 @@ typedef int (*TabListEntryCompare)(int x, int y);
 static struct TabListOverlay {
 	Screen_Body
 	int x, y, width, height;
-	cc_bool active, classic;
+	cc_bool active, classic, staysOpen;
 	int namesCount, elementOffset;
 	struct TextWidget title;
 	struct FontDesc font;
@@ -633,7 +633,7 @@ static int TabListOverlay_PointerDown(void* screen, int id, int x, int y) {
 
 static void TabListOverlay_KeyUp(void* screen, int key) {
 	struct TabListOverlay* s = (struct TabListOverlay*)screen;
-	if (key != KeyBinds[KEYBIND_TABLIST] || Input_TouchMode) return;
+	if (key != KeyBinds[KEYBIND_TABLIST] || s->staysOpen) return;
 	Gui_Remove((struct Screen*)s);
 }
 
@@ -727,7 +727,8 @@ static const struct ScreenVTABLE TabListOverlay_VTABLE = {
 };
 void TabListOverlay_Show(void) {
 	struct TabListOverlay* s  = &TabListOverlay_Instance;
-	s->VTABLE = &TabListOverlay_VTABLE;
+	s->VTABLE    = &TabListOverlay_VTABLE;
+	s->staysOpen = false;
 	Gui_Add((struct Screen*)s, GUI_PRIORITY_TABLIST);
 }
 
@@ -1973,6 +1974,7 @@ static void TouchScreen_TabClick(void* s, void* w) {
 		Gui_Remove((struct Screen*)&TabListOverlay_Instance);
 	} else {
 		TabListOverlay_Show();
+		TabListOverlay_Instance.staysOpen = true;
 	}
 }