BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix Android segfault when game exits before TouchScreenGUI is initalized

Browse Source
This commit is contained in:
Gregor Parzefall 2023-05-11 22:51:16 +02:00 committed by GitHub
parent 15445a0fbe
commit 15fb4cab15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/touchscreengui.cpp
View File

@ -563,6 +563,8 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc)
m_rarecontrolsbar.addButton(chat_id, L"Chat", "chat_btn.png");
m_rarecontrolsbar.addButton(inventory_id, L"inv", "inventory_btn.png");
m_rarecontrolsbar.addButton(drop_id, L"drop", "drop_btn.png");
m_initialized = true;
}
touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y)
@ -725,6 +727,8 @@ void TouchScreenGUI::handleReleaseEvent(size_t evt_id)
void TouchScreenGUI::translateEvent(const SEvent &event)
{
if (!m_initialized)
return;
if (!m_visible) {
infostream
<< "TouchScreenGUI::translateEvent got event but not visible!"
@ -1071,6 +1075,9 @@ void TouchScreenGUI::applyJoystickStatus()
TouchScreenGUI::~TouchScreenGUI()
{
if (!m_initialized)
return;
for (auto &button : m_buttons) {
if (button.guibutton) {
button.guibutton->drop();
@ -1096,6 +1103,9 @@ TouchScreenGUI::~TouchScreenGUI()
void TouchScreenGUI::step(float dtime)
{
if (!m_initialized)
return;
// simulate keyboard repeats
for (auto &button : m_buttons) {
if (!button.ids.empty()) {
@ -1180,6 +1190,9 @@ void TouchScreenGUI::registerHudItem(int index, const rect<s32> &rect)
void TouchScreenGUI::Toggle(bool visible)
{
if (!m_initialized)
return;
m_visible = visible;
for (auto &button : m_buttons) {
if (button.guibutton)

1
src/gui/touchscreengui.h
View File

@ -201,6 +201,7 @@ public:
void show();
private:
bool m_initialized = false;
IrrlichtDevice *m_device;
IGUIEnvironment *m_guienv;
IEventReceiver *m_receiver;