From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 13 Jul 2005 20:22:29 +0000 (+0000)
Subject: don't ignore hardcoded CLID from zapata.conf when usecallerid=no
X-Git-Tag: 1.2.0-beta1~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f50c27c3552764964b8b48726b49c8fd86aaa498;p=thirdparty%2Fasterisk.git

don't ignore hardcoded CLID from zapata.conf when usecallerid=no


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 1eadea3e69..7e7c01790c 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5844,13 +5844,15 @@ static void *ss_thread(void *data)
 		}
 		else
 			cs = NULL;
-		if (chan->cid.cid_num) {
+		if (number || name) {
+		    if (chan->cid.cid_num) {
 			free(chan->cid.cid_num);
 			chan->cid.cid_num = NULL;
-		}
-		if (chan->cid.cid_name) {
+		    }
+		    if (chan->cid.cid_name) {
 			free(chan->cid.cid_name);
 			chan->cid.cid_name = NULL;
+		    }
 		}
 		if (number)
 			ast_shrink_phone_number(number);