[svn-commits] rmudgett: branch rmudgett/align_analog r295988 - /team/rmudgett/align_analog/...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Nov 23 12:52:15 2010
New Revision: 295988

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=295988
Log:
Incorporate the issue_18129_v1.8_v2.tweak.patch.

Modified:
    team/rmudgett/align_analog/channels/chan_dahdi.c

Modified: team/rmudgett/align_analog/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/align_analog/channels/chan_dahdi.c?view=diff&rev=295988&r1=295987&r2=295988
==============================================================================
--- team/rmudgett/align_analog/channels/chan_dahdi.c (original)
+++ team/rmudgett/align_analog/channels/chan_dahdi.c Tue Nov 23 12:52:15 2010
@@ -8835,19 +8835,15 @@
 	if (idx == SUB_REAL) {
 		/* Ensure the CW timers decrement only on a single subchannel */
 		if (p->cidcwexpire) {
-			--p->cidcwexpire;
-
-			/* Expire CID/CW */
-			if (p->cidcwexpire == 1) {
+			if (!--p->cidcwexpire) {
+				/* Expired CID/CW */
 				ast_verb(3, "CPE does not support Call Waiting Caller*ID.\n");
 				restore_conference(p);
 			}
 		}
 		if (p->callwaitingrepeat) {
-			--p->callwaitingrepeat;
-
-			/* Repeat callwaiting tone */
-			if (p->callwaitingrepeat == 1) {
+			if (!--p->callwaitingrepeat) {
+				/* Expired, Repeat callwaiting tone */
 				++p->callwaitrings;
 				dahdi_callwait(ast);
 			}