From 0992f27cad720dcf985645708e8dec415b53821a Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Mon, 21 Nov 2011 16:55:38 -0500
Subject: Fix the correct exit from the dungeon finder queue.

By Giuseppe Montesanto

Conflicts:

	src/server/game/DungeonFinding/LFGScripts.cpp
---
 src/server/game/DungeonFinding/LFGMgr.h       | 2 +-
 src/server/game/DungeonFinding/LFGScripts.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 0d11405789d..95cb2e81869 100755
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -292,6 +292,7 @@ class LFGMgr
         LfgState GetState(uint64 guid);
         const LfgDungeonSet& GetSelectedDungeons(uint64 guid);
         uint32 GetDungeon(uint64 guid, bool asId = true);
+        void SetState(uint64 guid, LfgState state);
         void ClearState(uint64 guid);
         void RemovePlayerData(uint64 guid);
         void RemoveGroupData(uint64 guid);
@@ -304,7 +305,6 @@ class LFGMgr
         uint8 GetRoles(uint64 guid);
         const std::string& GetComment(uint64 gguid);
         void RestoreState(uint64 guid);
-        void SetState(uint64 guid, LfgState state);
         void SetDungeon(uint64 guid, uint32 dungeon);
         void SetSelectedDungeons(uint64 guid, const LfgDungeonSet& dungeons);
         void SetLockedDungeons(uint64 guid, const LfgLockMap& lock);
diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
index f553b069162..42119a02ef8 100644
--- a/src/server/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
@@ -82,6 +82,7 @@ void LFGScripts::OnRemoveMember(Group* group, uint64 guid, RemoveMethod method,
     }
 
     sLFGMgr->ClearState(guid);
+    sLFGMgr->SetState(guid, LFG_STATE_NONE);
     if (Player* player = ObjectAccessor::FindPlayer(guid))
     {
         /*
-- 
cgit v1.2.3