Make sure ExecIf stuff returns properly (bug #3864)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5297 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 10 insertions, 3 deletions

diff --git a/apps/app_while.c b/apps/app_while.c
index e33bae52f..5822c2ff5 100755
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -29,7 +29,9 @@
 
 static char *exec_app = "ExecIf";
 static char *exec_desc = "  ExecIF (<expr>|<app>|<data>)\n"
-"If <expr> is true, execute and return the result of <app>(<data>)\n\n";
+"If <expr> is true, execute and return the result of <app>(<data>).\n"
+"If <expr> is true, but <app> is not found, then the application\n"
+"will return a non-zero value.";
 static char *exec_synopsis = "ExecIF (<expr>|<app>|<data>)";
 
 static char *start_app = "While";
@@ -73,8 +75,13 @@ static int execif_exec(struct ast_channel *chan, void *data) {
 		} else
 			mydata = "";
 
-		if(ast_true(expr) && (app = pbx_findapp(myapp))) {
-			res = pbx_exec(chan, app, mydata, 1);
+		if (ast_true(expr)) { 
+			if ((app = pbx_findapp(myapp))) {
+				res = pbx_exec(chan, app, mydata, 1);
+			} else {
+				ast_log(LOG_WARNING, "Count not find application! (%s)\n", myapp);
+				res = -1;
+			}
 		}
 	} else {
 		ast_log(LOG_ERROR,"Invalid Syntax.\n");