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

Defer closing player name dialog to avoid potential memory corruption/crashes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11163 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-04-25 23:43:48 +00:00
parent 66da1d408b
commit c197356f86
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/states_screens/dialogs/enter_player_name_dialog.cpp
View File

@ -39,6 +39,7 @@ EnterPlayerNameDialog::EnterPlayerNameDialog(INewPlayerListener* listener,
ModalDialog(w, h)
{
m_listener = listener;
m_self_destroy = false;
loadFromFile("enter_player_name_dialog.stkgui");
TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
@ -128,6 +129,27 @@ void EnterPlayerNameDialog::onEnterPressedInternal()
UserConfigParams::m_all_players.push_back( new PlayerProfile(playerName) );
// It's unsafe to delete from inside the event handler so we do it later
m_self_destroy = true;
}
else
{
LabelWidget* label = getWidget<LabelWidget>("title");
label->setText(_("Cannot add a player with this name."), false);
sfx_manager->quickSound( "anvil" );
}
}
// -----------------------------------------------------------------------------
void EnterPlayerNameDialog::onUpdate(float dt)
{
// It's unsafe to delete from inside the event handler so we do it later
if (m_self_destroy)
{
TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
stringw playerName = textCtrl->getText();
// irrLicht is too stupid to remove focus from deleted widgets
// so do it by hand
GUIEngine::getGUIEnv()->removeFocus( textCtrl->getIrrlichtElement() );
@ -142,14 +164,4 @@ void EnterPlayerNameDialog::onEnterPressedInternal()
if (listener != NULL) listener->onNewPlayerWithName( playerName );
}
else
{
LabelWidget* label = getWidget<LabelWidget>("title");
label->setText(_("Cannot add a player with this name."), false);
sfx_manager->quickSound( "anvil" );
}
}
// -----------------------------------------------------------------------------

2
src/states_screens/dialogs/enter_player_name_dialog.hpp
View File

@ -50,6 +50,7 @@ public:
private:
INewPlayerListener* m_listener;
bool m_self_destroy;
public:
@ -63,6 +64,7 @@ public:
void onEnterPressedInternal();
GUIEngine::EventPropagation processEvent(const std::string& eventSource);
virtual void onUpdate(float dt);
//virtual void onTextUpdated();
};