Merged revisions 189077 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r189077 | seanbright | 2009-04-17 15:36:38 -0400 (Fri, 17 Apr 2009) | 1 line

  Fix copy/paste error with 'transmit silence' flag.
........

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

diff --git a/main/asterisk.c b/main/asterisk.c
index 80734208b713346a9a19aaa33bbfbc9bb179bd02..e3c83f14a266af23293ba4700285a4bbee51a2ef 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -431,7 +431,7 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c
        ast_cli(a->fd, "  Executable includes:         %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES) ? "Enabled" : "Disabled");
        ast_cli(a->fd, "  Transcode via SLIN:          %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSCODE_VIA_SLIN) ? "Enabled" : "Disabled");
        ast_cli(a->fd, "  Internal timing:             %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_INTERNAL_TIMING) ? "Enabled" : "Disabled");
-       ast_cli(a->fd, "  Transmit silence during rec: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_INTERNAL_TIMING) ? "Enabled" : "Disabled");
+       ast_cli(a->fd, "  Transmit silence during rec: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSMIT_SILENCE) ? "Enabled" : "Disabled");
 
        ast_cli(a->fd, "\n* Subsystems\n");
        ast_cli(a->fd, "  -------------\n");