[svn-commits] qwell: trunk r103791 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Feb 18 15:30:22 2008
New Revision: 103791

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103791
Log:
Merged revisions 103790 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103790 | qwell | 2008-02-18 15:23:32 -0600 (Mon, 18 Feb 2008) | 4 lines

Correct a message when echocancelwhenbridged is on, but echocancel is not.

Closes issue #12019

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=103791&r1=103790&r2=103791
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Mon Feb 18 15:30:22 2008
@@ -11858,14 +11858,14 @@
 				for (x = 0; x < tmp->echocancel.head.param_count; x++) {
 					ast_cli(a->fd, "\t\t%s: %ud\n", tmp->echocancel.params[x].name, tmp->echocancel.params[x].value);
 				}
-				ast_cli(a->fd, "\t%scurrently %s\n", tmp->echocanbridged ? "" : "(unless TDM bridged) ", tmp->echocanon ? "ON" : "OFF");
+				ast_cli(a->fd, "\t%scurrently %s\n", (!tmp->echocanon || tmp->echocanbridged) ? "" : "(unless TDM bridged) ", tmp->echocanon ? "ON" : "OFF");
 			} else {
 				ast_cli(a->fd, "\tnone\n");
 			}
 #else
 			if (tmp->echocancel) {
 				ast_cli(a->fd, "\t%d taps\n", tmp->echocancel);
-				ast_cli(a->fd, "\t%scurrently %s\n", tmp->echocanbridged ? "" : "(unless TDM bridged) ", tmp->echocanon ? "ON" : "OFF");
+				ast_cli(a->fd, "\t%scurrently %s\n", (!tmp->echocanon || tmp->echocanbridged) ? "" : "(unless TDM bridged) ", tmp->echocanon ? "ON" : "OFF");
 			}
 			else
 				ast_cli(a->fd, "\tnone\n");