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

stujones11 · nerzhul · commit cff1e9ca273b · 2019-04-19T12:06:47.000+02:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1880,6 +1880,9 @@ void Game::processKeyInput()`
`1880`	`1880`	`} else if (wasKeyDown(KeyType::INVENTORY)) {`
`1881`	`1881`	`openInventory();`
`1882`	`1882`	`} else if (input->cancelPressed()) {`
	`1883`	`+#ifdef __ANDROID__`
	`1884`	`+ m_android_chat_open = false;`
	`1885`	`+#endif`
`1883`	`1886`	`if (!gui_chat_console->isOpenInhibited()) {`
`1884`	`1887`	`showPauseMenu();`
`1885`	`1888`	`}`
`@@ -2079,6 +2082,7 @@ void Game::handleAndroidChatInput()`
`2079`	`2082`	`if (m_android_chat_open && porting::getInputDialogState() == 0) {`
`2080`	`2083`	`std::string text = porting::getInputDialogValue();`
`2081`	`2084`	`client->typeChatMessage(utf8_to_wide(text));`
	`2085`	`+ m_android_chat_open = false;`
`2082`	`2086`	`}`
`2083`	`2087`	`}`
`2084`	`2088`	`#endif`