summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-22 17:35:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-22 20:00:36 +0300
commit6fa671cdc65cd3ad507eca7dbee604418e449aa7 (patch)
tree9090841ed74fbb80427310cd96118759267b2941 /src/net
parent1b853996cb2616e181e8822f74d79bd258c97c14 (diff)
downloadmanaplus-6fa671cdc65cd3ad507eca7dbee604418e449aa7.tar.gz
manaplus-6fa671cdc65cd3ad507eca7dbee604418e449aa7.tar.bz2
manaplus-6fa671cdc65cd3ad507eca7dbee604418e449aa7.tar.xz
manaplus-6fa671cdc65cd3ad507eca7dbee604418e449aa7.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/chathandler.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 872afe05e..22db67357 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -698,7 +698,10 @@ void ChatHandler::processChatRoomJoinAck(Net::MessageIn &msg)
ChatObject *oldChat = ChatObject::findById(id);
- PlayerInfo::setRoomName(oldChat->title);
+ if (oldChat)
+ PlayerInfo::setRoomName(oldChat->title);
+ else
+ PlayerInfo::setRoomName(std::string());
chatWindow->joinRoom(true);
ChatObject *const obj = new ChatObject;
if (oldChat)