1 files changed, 10 insertions, 9 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 07ed7e390..872afe05e 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -697,19 +697,20 @@ void ChatHandler::processChatRoomJoinAck(Net::MessageIn &msg)
     }
 
     ChatObject *oldChat = ChatObject::findById(id);
-    if (!oldChat)
-        oldChat = new ChatObject;
 
     PlayerInfo::setRoomName(oldChat->title);
     chatWindow->joinRoom(true);
     ChatObject *const obj = new ChatObject;
-    obj->ownerId = oldChat->ownerId;
-    obj->chatId = oldChat->chatId;
-    obj->maxUsers = oldChat->maxUsers;
-    obj->currentUsers = oldChat->currentUsers;
-    obj->type = oldChat->type;
-    obj->title = oldChat->title;
-//    obj->update();
+    if (oldChat)
+    {
+        obj->ownerId = oldChat->ownerId;
+        obj->chatId = oldChat->chatId;
+        obj->maxUsers = oldChat->maxUsers;
+        obj->currentUsers = oldChat->currentUsers;
+        obj->type = oldChat->type;
+        obj->title = oldChat->title;
+//        obj->update();
+    }
     localPlayer->setChat(obj);
 }