summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/charselectdialog.cpp1
-rw-r--r--src/gui/widgets/playerbox.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index c2c63248..e22c4daf 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -253,6 +253,7 @@ void CharSelectDialog::attemptCharacterSelect(int index)
if (mLocked)
return;
+ setVisible(false);
mCharHandler->chooseCharacter(mCharacterEntries[index]->getCharacter());
lock();
}
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index d2c16dbc..57cbec6f 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -72,6 +72,8 @@ PlayerBox::~PlayerBox()
{
instances--;
+ mPlayer = 0;
+
if (instances == 0)
{
for_each(background.grid, background.grid + 9, dtor<Image*>());