[svn-commits] file: trunk r50294 - /trunk/channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: file
Date: Tue Jan  9 22:21:46 2007
New Revision: 50294

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50294
Log:
Allow usedistinctiveringdetection and distinctiveringaftercid to be reset during a reload. (issue #8739 reported by tzafrir)

Modified:
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=50294&r1=50293&r2=50294
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Tue Jan  9 22:21:46 2007
@@ -11754,11 +11754,9 @@
 					return -1;
 			}
 		} else if (!strcasecmp(v->name, "usedistinctiveringdetection")) {
-			if (ast_true(v->value))
-				usedistinctiveringdetection = 1;
+			usedistinctiveringdetection = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "distinctiveringaftercid")) {
-			if (ast_true(v->value))
-				distinctiveringaftercid = 1;
+			distinctiveringaftercid = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "dring1context")) {
 			ast_copy_string(drings.ringContext[0].contextData,v->value,sizeof(drings.ringContext[0].contextData));
 		} else if (!strcasecmp(v->name, "dring2context")) {