From 03a7616c3868c87c6aa86aeaaeae63c946636334 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 12 Mar 2008 06:43:05 +0000
Subject: Replaced one incorrect nullpo check in chat_deletenpcchat()

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12347 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/chat.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/map/chat.c')

diff --git a/src/map/chat.c b/src/map/chat.c
index 19f265b27..a466424d4 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -307,9 +307,11 @@ int chat_createnpcchat(struct npc_data* nd, const char* title, int limit, bool p
 int chat_deletenpcchat(struct npc_data* nd)
 {
 	struct chat_data *cd;
-
 	nullpo_retr(0, nd);
-	nullpo_retr(0, cd = (struct chat_data*)map_id2bl(nd->chat_id));
+
+	cd = (struct chat_data*)map_id2bl(nd->chat_id);
+	if( cd == NULL )
+		return 0;
 	
 	chat_npckickall(cd);
 	clif_clearchat(cd, 0);
-- 
cgit v1.2.3-60-g2f50