*Update to Mangos 7125.

--HG--
branch : trunk

1 files changed, 1 insertions, 3 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index ecb16ce9521..7ce5de97297 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -910,13 +910,11 @@ void Creature::sendPreparedGossip(Player* player)
     if(!player)
         return;
 
-    GossipMenu& gossipmenu = player->PlayerTalkClass->GetGossipMenu();
-
     if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT) // if world event npc then
         gameeventmgr.HandleWorldEventGossip(player, this);      // update world state with progress
 
     // in case empty gossip menu open quest menu if any
-    if (gossipmenu.Empty() && GetNpcTextId() == 0)
+    if (player->PlayerTalkClass->GetGossipMenu().Empty() && !player->PlayerTalkClass->GetQuestMenu().Empty())
     {
         player->SendPreparedQuest(GetGUID());
         return;