From 540071002e949dfa7be3999a58be46d75d7631e9 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sun, 11 Dec 2016 22:17:32 +0000 Subject: [PATCH] Fix segfault on startup error on Android --- src/touchscreengui.cpp | 6 ++++-- src/touchscreengui.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp index e3c6a39a9..8d210c63a 100644 --- a/src/touchscreengui.cpp +++ b/src/touchscreengui.cpp @@ -177,8 +177,10 @@ void AutoHideButtonBar::init(ISimpleTextureSource* tsrc, AutoHideButtonBar::~AutoHideButtonBar() { - m_starter.guibutton->setVisible(false); - m_starter.guibutton->drop(); + if (m_starter.guibutton) { + m_starter.guibutton->setVisible(false); + m_starter.guibutton->drop(); + } } void AutoHideButtonBar::addButton(touch_gui_button_id button_id, diff --git a/src/touchscreengui.h b/src/touchscreengui.h index b4de1b032..53fc6d683 100644 --- a/src/touchscreengui.h +++ b/src/touchscreengui.h @@ -75,7 +75,7 @@ struct button_info { float repeatdelay; irr::EKEY_CODE keycode; std::vector ids; - IGUIButton* guibutton; + IGUIButton* guibutton = NULL; bool immediate_release; }; -- 2.25.1