From: stujones11 <stujones111@gmail.com>
Date: Fri, 19 Apr 2019 10:06:47 +0000 (+0100)
Subject: Android: Clear chat open flag on cancel or completion (#8478)
X-Git-Tag: 5.1.0~236
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cff1e9ca273be6d0719f18ac72622f7b7f7dbdb0;p=oweals%2Fminetest.git

Android: Clear chat open flag on cancel or completion (#8478)
---

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 192c899d9..379f32949 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1880,6 +1880,9 @@ void Game::processKeyInput()
 	} else if (wasKeyDown(KeyType::INVENTORY)) {
 		openInventory();
 	} else if (input->cancelPressed()) {
+#ifdef __ANDROID__
+		m_android_chat_open = false;
+#endif
 		if (!gui_chat_console->isOpenInhibited()) {
 			showPauseMenu();
 		}
@@ -2079,6 +2082,7 @@ void Game::handleAndroidChatInput()
 	if (m_android_chat_open && porting::getInputDialogState() == 0) {
 		std::string text = porting::getInputDialogValue();
 		client->typeChatMessage(utf8_to_wide(text));
+		m_android_chat_open = false;
 	}
 }
 #endif