diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-07-13 20:22:29 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-07-13 20:22:29 +0000 |
commit | 927ff77ac180832d3a1f88e27433f1fd18a3c0d8 (patch) | |
tree | d6d578ab0a5a0f384bc3f21d974fe5da16899d20 /channels | |
parent | 90a8bcf11ab1f795cf560ace7b60178a6c32a014 (diff) |
don't ignore hardcoded CLID from zapata.conf when usecallerid=no
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6126 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/chan_zap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 1eadea3e6..7e7c01790 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); |