aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-18 21:23:32 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-18 21:23:32 +0000
commit8adbdd97e4be8d8bb0300bceea7f936d9148d646 (patch)
treea34164cfc040441ddc544223677b23227711f9e9 /channels
parent55b1d0a55de701ecc743dea3fe008ed404774fe6 (diff)
Correct a message when echocancelwhenbridged is on, but echocancel is not.
Issue #12019 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@103790 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e8d9fb2aa..0f5c2d028 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++) {