From: Jason Parker <jparker@digium.com>
Date: Mon, 18 Feb 2008 21:23:32 +0000 (+0000)
Subject: Correct a message when echocancelwhenbridged is on, but echocancel is not.
X-Git-Tag: 1.4.19~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ce44f1c285e2b73747887c4e858bc2b7c5357fc;p=thirdparty%2Fasterisk.git

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

Issue #12019


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e8d9fb2aa1..0f5c2d028d 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -9990,7 +9990,7 @@ static int zap_show_channel(int fd, int argc, char **argv)
 			ast_cli(fd, "Default law: %s\n", tmp->law == ZT_LAW_MULAW ? "ulaw" : tmp->law == ZT_LAW_ALAW ? "alaw" : "unknown");
 			ast_cli(fd, "Fax Handled: %s\n", tmp->faxhandled ? "yes" : "no");
 			ast_cli(fd, "Pulse phone: %s\n", tmp->pulsedial ? "yes" : "no");
-			ast_cli(fd, "Echo Cancellation: %d taps%s, currently %s\n", tmp->echocancel, tmp->echocanbridged ? "" : " unless TDM bridged", tmp->echocanon ? "ON" : "OFF");
+			ast_cli(fd, "Echo Cancellation: %d taps%s, currently %s\n", tmp->echocancel, (!tmp->echocancel || tmp->echocanbridged) ? "" : " unless TDM bridged", tmp->echocanon ? "ON" : "OFF");
 			if (tmp->master)
 				ast_cli(fd, "Master Channel: %d\n", tmp->master->channel);
 			for (x = 0; x < MAX_SLAVES; x++) {