ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid a crash in general text field dialog.

Browse Source 
onEnterPressed can be executed twice - in event handler and in input manager.
This commit is contained in:
Deve 2018-04-15 21:14:24 +02:00 committed by Benau
parent 789d75bf26
commit a7deff5c3e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/states_screens/dialogs/general_text_field_dialog.cpp
View File

@ -69,7 +69,7 @@ GUIEngine::EventPropagation GeneralTextFieldDialog::processEvent(const std::stri
else if (eventSource == "ok") else if (eventSource == "ok")
{ {
// If validation callback return true, dismiss the dialog // If validation callback return true, dismiss the dialog
if (m_val_cb(m_title, m_text_field)) if (!m_self_destroy && m_val_cb(m_title, m_text_field))
m_self_destroy = true; m_self_destroy = true;
return GUIEngine::EVENT_BLOCK; return GUIEngine::EVENT_BLOCK;
} }
@ -88,7 +88,7 @@ void GeneralTextFieldDialog::onEnterPressedInternal()
return; return;
} }
if (m_val_cb(m_title, m_text_field)) if (!m_self_destroy && m_val_cb(m_title, m_text_field))
m_self_destroy = true; m_self_destroy = true;
} // onEnterPressedInternal } // onEnterPressedInternal