verbose fixes (bug #2602)

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

diff --git a/cli.c b/cli.c
index 613e3a22fc11543fc81dc45c9d4787ece01463cc..045844021aca0b34db1bd80713ec5cf6af25176e 100755 (executable)
--- a/cli.c
+++ b/cli.c
@@ -148,7 +148,7 @@ static int handle_set_verbose(int fd, int argc, char *argv[])
                ast_cli(fd, "Verbosity was %d and is now %d\n", oldval, option_verbose);
        else if (oldval > 0 && option_verbose > 0)
                ast_cli(fd, "Verbosity is atleast %d\n", option_verbose);
-       else if (oldval > 0 && option_debug == 0)
+       else if (oldval > 0 && option_verbose == 0)
                ast_cli(fd, "Verbosity is now OFF\n");
        return RESULT_SUCCESS;
 }

diff --git a/pbx.c b/pbx.c
index 16888bdbfdac6a1a9b68012a058e6217883f7ab5..04f1569769b36149a4e4c44f73972ae97c487298 100755 (executable)
--- a/pbx.c
+++ b/pbx.c
@@ -1258,7 +1258,7 @@ static int pbx_extension_helper(struct ast_channel *c, char *context, char *exte
                                pbx_substitute_variables(passdata, sizeof(passdata), c, e);
                                if (option_debug)
                                                ast_log(LOG_DEBUG, "Launching '%s'\n", app->name);
-                               else if (option_verbose > 2)
+                               if (option_verbose > 2)
                                                ast_verbose( VERBOSE_PREFIX_3 "Executing %s(\"%s\", \"%s\") %s\n", 
                                                                term_color(tmp, app->name, COLOR_BRCYAN, 0, sizeof(tmp)),
                                                                term_color(tmp2, c->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)),