Sfoglia il codice sorgente

Replaced one incorrect nullpo check in chat_deletenpcchat()

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12347 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 anni fa
parent
commit
0af5774042
1 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 4 2
      src/map/chat.c

+ 4 - 2
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);