1 files changed, 5 insertions, 3 deletions
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index ed4a1c19..e6e3452f 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -131,11 +131,13 @@ void ChatHandler::computerDisconnected(NetComputer *comp)
         // Remove user from all channels.
         chatChannelManager->removeUserFromAllChannels(computer);
 
-        // Remove the character from the player map
-        mPlayerMap.erase(computer->characterName);
-
         // Remove user from party
         removeUserFromParty(*computer);
+
+        // Remove the character from the player map
+        // need to do this after removing them from party
+        // as that uses the player map
+        mPlayerMap.erase(computer->characterName);
     }
 
     delete computer;