From c645c993106cddf210d427ff74f8e0828e322dc2 Mon Sep 17 00:00:00 2001
From: win32 <none@none>
Date: Wed, 16 Dec 2009 22:03:37 +0200
Subject: Fix crash in npc_escortAI::Start Closes #812

--HG--
branch : trunk
---
 src/bindings/scripts/base/escort_ai.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/bindings/scripts/base/escort_ai.cpp b/src/bindings/scripts/base/escort_ai.cpp
index e751d6c691d..9b31d032a71 100644
--- a/src/bindings/scripts/base/escort_ai.cpp
+++ b/src/bindings/scripts/base/escort_ai.cpp
@@ -454,8 +454,13 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
 
     if (WaypointList.empty())
     {
-        error_db_log("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", m_pQuestForEscort->GetQuestId());
-        return;
+        if (pQuest != NULL)
+        {
+            error_db_log("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", m_pQuestForEscort->GetQuestId());
+            return;
+        }
+        else
+            return;
     }
 
     //set variables
-- 
cgit v1.2.3