diff options
author | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-04-27 22:18:27 +0200 |
---|---|---|
committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-04-27 22:18:27 +0200 |
commit | 3e50aa43e13ed0cd2f5bb937c46bd064bdbfeeff (patch) | |
tree | 82d2b4dc94d039460061d4d07b9367a95e4bec79 /src/net/tmwa | |
parent | f824c159af0a67e6d68f0934b4810dffc1c33a91 (diff) | |
download | mana-client-3e50aa43e13ed0cd2f5bb937c46bd064bdbfeeff.tar.gz mana-client-3e50aa43e13ed0cd2f5bb937c46bd064bdbfeeff.tar.bz2 mana-client-3e50aa43e13ed0cd2f5bb937c46bd064bdbfeeff.tar.xz mana-client-3e50aa43e13ed0cd2f5bb937c46bd064bdbfeeff.zip |
Fixing crash when selecting a character that has a Dark Talisman equipped
This resolves http://bugs.manasource.org/view.php?id=330
Reviewed-by: Bertram
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/playerhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/specialhandler.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 49db66ae..3dab8c34 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -233,6 +233,8 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg) case SMSG_PLAYER_STAT_UPDATE_1: { + if (!player_node) + break; int type = msg.readInt16(); int value = msg.readInt32(); diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index c5f5d540..bcf5ba44 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -107,7 +107,8 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg) player_node->setAttributeBase(skillId, level); player_node->setAttributeEffective(skillId, level); - skillDialog->setModifiable(skillId, up); + if (skillDialog) + skillDialog->setModifiable(skillId, up); } break; |