From c628685d599fd8885b81dd7fd7463fdf693ed9d5 Mon Sep 17 00:00:00 2001 From: Spp Date: Fri, 26 Nov 2010 17:16:21 +0100 Subject: Core/Dungeon Finder: Fix a crash in Join Closes issue 4939 --HG-- branch : trunk --- src/server/game/DungeonFinding/LFGMgr.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 8cb3909de82..750bbaf585d 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -525,9 +525,12 @@ void LFGMgr::Join(Player* plr, uint8 roles, LfgDungeonSet* dungeons, std::string if (sameDungeons) // Joining the same dungeons -- Send OK { plr->GetSession()->SendLfgJoinResult(LFG_JOIN_OK); - for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) - if (itr->getSource() && itr->getSource()->GetSession()) - itr->getSource()->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE, dungeons, comment); + if (grp) + { + for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + if (itr->getSource() && itr->getSource()->GetSession()) + itr->getSource()->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE, dungeons, comment); + } dungeons->clear(); delete dungeons; return; -- cgit v1.2.3