Fix merge fail

This commit is contained in:
Carbenium
2015-07-21 19:11:36 +02:00
parent c0ee4ceac4
commit e17af4b098

View File

@@ -767,7 +767,7 @@ void LFGMgr::GetCompatibleDungeons(LfgDungeonSet& dungeons, GuidSet const& playe
bool eraseDungeon = true;
// Don't remove the dungeon if team members are trying to continue a locked instance
if (it2->second == LFG_LOCKSTATUS_RAID_LOCKED && isContinue)
if (it2->second.lockStatus == LFG_LOCKSTATUS_RAID_LOCKED && isContinue)
{
LFGDungeonData const* dungeon = GetLFGDungeon(dungeonId);
ASSERT(dungeon);