From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 8 Oct 2004 23:29:50 +0000 (+0000)
Subject: verbose fixes (bug #2602)
X-Git-Tag: 1.0.11.1~446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df358f42e0c75b80fda20069d7b186cb86418841;p=thirdparty%2Fasterisk.git

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 613e3a22fc..045844021a 100755
--- 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 16888bdbfd..04f1569769 100755
--- 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)),