summaryrefslogtreecommitdiff
path: root/src/gui/charselectdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r--src/gui/charselectdialog.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index ffa88cb75..bc2c42dc7 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -319,7 +319,6 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
CharSelectDialog::~CharSelectDialog()
{
- Net::getCharHandler()->clear();
}
void CharSelectDialog::action(const gcn::ActionEvent &event)
@@ -351,6 +350,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
if (eventId == "use" && mCharacterEntries[selected]->getCharacter())
{
attemptCharacterSelect(selected);
+// Net::getCharHandler()->clear();
return;
}
else if (eventId == "new" &&
@@ -371,6 +371,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
}
if (eventId == "switch")
{
+ Net::getCharHandler()->clear();
close();
}
else if (eventId == "change_password")
@@ -383,6 +384,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
}
else if (eventId == "unregister")
{
+ Net::getCharHandler()->clear();
Client::setState(STATE_UNREGISTER);
}
else if (eventId == "try delete character")