Make the usedistinctiveringdetection option work again. (issue #9823 reported by...

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index c9ffd9e2ed310e728f5791886142e11cf3769794..ea02e99a9ae35a499df3f73d6d9222d77aec8934 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -206,7 +206,6 @@ static char defaultozz[64] = "";
 
 static char progzone[10] = "";
 
-static int usedistinctiveringdetection = 0;
 static int distinctiveringaftercid = 0;
 
 static int numbufs = 4;
@@ -7376,7 +7375,7 @@ static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pr
                /* Flag to destroy the channel must be cleared on new mkif.  Part of changes for reload to work */
                tmp->destroy = 0;
                tmp->drings = drings;
-               tmp->usedistinctiveringdetection = usedistinctiveringdetection;
+               tmp->usedistinctiveringdetection = conf.chan.usedistinctiveringdetection;
                tmp->callwaitingcallerid = conf.chan.callwaitingcallerid;
                tmp->threewaycalling = conf.chan.threewaycalling;
                tmp->adsi = conf.chan.adsi;