From e0e9ff2e4346053559fa04d03b629d26ba3182fa Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 18 Feb 2008 21:30:22 +0000 Subject: [PATCH] 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103791 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 7748529..e3d97ce 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -11858,14 +11858,14 @@ static char *zap_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_a 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"); -- 1.7.9.5