[svn-commits] file: branch 1.4 r66312 - /branches/1.4/channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: file
Date: Mon May 28 18:16:56 2007
New Revision: 66312

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66312
Log:
Make the usedistinctiveringdetection option work again. (issue #9823 reported by premeau)

Modified:
    branches/1.4/channels/chan_zap.c

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=66312&r1=66311&r2=66312
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Mon May 28 18:16:56 2007
@@ -206,7 +206,6 @@
 
 static char progzone[10] = "";
 
-static int usedistinctiveringdetection = 0;
 static int distinctiveringaftercid = 0;
 
 static int numbufs = 4;
@@ -7376,7 +7375,7 @@
 		/* 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;