diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-18 21:30:22 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-18 21:30:22 +0000 |
| commit | 9c4d1139101f268831bd2d9aa9ec260c22d0ca38 (patch) | |
| tree | bc9b9fceb0e7c4d140c207d516021e5d86fdb70e /channels | |
| parent | 22ba2267889b1c4aa77d0f1dd0949c661ed1c4f3 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@103791 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 774852903..e3d97ce04 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"); |