From 77a4c494ec2cbaf17a67024283012102aa4d0d52 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 1 Apr 2010 21:15:55 -0600
Subject: Fix crash when trying to talk to NPCs under ManaServ at a distance

Reviewed-by: Chuck Miller
---
 src/net/manaserv/npchandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 5bacb90b..258c72c0 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -68,6 +68,9 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
 
     if (diag == mNpcDialogs.end())
     {
+        if (msg.getId() == GPMSG_NPC_ERROR || msg.getId() == GPMSG_NPC_CLOSE)
+            return; // Dialog is pointless in these cases
+
         dialog = new NpcDialog(npcId);
         Wrapper wrap;
         wrap.dialog = dialog;
-- 
cgit v1.2.3-60-g2f50