Changed the order of network message handling and logic, in order to prevent an

incoming character delete message from deleting the player character that was
about to be drawn.

2 files changed, 1 insertions, 3 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 845c6d64..fc6be59f 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -151,11 +151,9 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "new" && n_character <= MAX_SLOT)
     {
         // Start new character dialog
-        mCharInfo->lock();
         CharCreateDialog *charCreateDialog =
             new CharCreateDialog(this, mCharInfo->getPos(), mNetwork, mSex);
         charServerHandler.setCharCreateDialog(charCreateDialog);
-        mCharInfo->unlock();
     }
     else if (event.getId() == "delete")
     {
diff --git a/src/main.cpp b/src/main.cpp
index 98a7aeb7..78b967e2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -625,9 +625,9 @@ int main(int argc, char *argv[])
             guiInput->pushInput(event);
         }
 
-        gui->logic();
         network->flush();
         network->dispatchMessages();
+        gui->logic();
 
         if (network->getState() == Network::NET_ERROR)
         {