Core/Scripts: Fix menu clearing in onGossipSelect()-sections for some scripts (including examples) - patch/fix by Paradox

Closes issue 4524

--HG--
branch : trunk

3 files changed, 3 insertions, 0 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index dc1bb246a25..bbe9cf54a3f 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -151,6 +151,7 @@ class npc_announcer_toc10 : public CreatureScript
 
         bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
         {
+            pPlayer->PlayerTalkClass->ClearMenus();
             InstanceScript* m_pInstance;
             m_pInstance = (InstanceScript*)pCreature->GetInstanceScript();
             if (!m_pInstance) return false;
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index ab2b41ac9b3..8e075f2ae7c 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -1278,6 +1278,7 @@ public:
 
     //bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
     //{
+    //    pPlayer->PlayerTalkClass->ClearMenus();
     //    switch(uiAction)
     //    {
     //        case GOSSIP_ACTION_INFO_DEF+1:
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index 759f2575293..1ef36684b25 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -503,6 +503,7 @@ public:
 
     bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*uiSender*/, uint32 uiAction)
     {
+        pPlayer->PlayerTalkClass->ClearMenus();
         uint32 spellId = 0;
         switch (uiAction)
         {