diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-04-12 21:52:27 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-04-16 17:43:52 -0600 |
| commit | cf4a1da4eaffe19090a2246e0d3111b885a64ace (patch) | |
| tree | 6187c8c7a91796e485c71ea7c88c819bec902b66 /src/gui | |
| parent | 11a6f342e579c26320334b9ae9735701386e3b25 (diff) | |
| download | Mana-cf4a1da4eaffe19090a2246e0d3111b885a64ace.tar.gz Mana-cf4a1da4eaffe19090a2246e0d3111b885a64ace.tar.bz2 Mana-cf4a1da4eaffe19090a2246e0d3111b885a64ace.tar.xz Mana-cf4a1da4eaffe19090a2246e0d3111b885a64ace.zip | |
Fix canceling game connection
Reviewed-by: Bertram
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/charselectdialog.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/playerbox.cpp | 2 |
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*>()); |