From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 17 Jul 2007 20:05:19 +0000 (+0000)
Subject: Merged revisions 75405 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2044
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee6d59eef2c2e9b97d95c6869b6662413c22446a;p=thirdparty%2Fasterisk.git

Merged revisions 75405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75405 | mmichelson | 2007-07-17 15:03:48 -0500 (Tue, 17 Jul 2007) | 6 lines

Fixing an error I made earlier. ast_fileexists can return -1 on failure, so I need to be sure that we only enter the if
statement if it is successful.

Related to my fix to issue #10186


........


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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index ac97f5a323..fec3f99e90 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1917,7 +1917,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
 		if (res == 0) {
 			if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) {
 				if (!ast_strlen_zero(announce)) {
-					if (ast_fileexists(announce, NULL, chan->language)) {
+					if (ast_fileexists(announce, NULL, chan->language) > 0) {
 						if(!(res = ast_streamfile(chan, announce, chan->language)))								
 							ast_waitstream(chan, AST_DIGIT_ANY);
 					} else
@@ -1930,7 +1930,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
 				}
 			} else {
 				if (!ast_strlen_zero(announce)) {
-					if (ast_fileexists(announce, NULL, chan->language)) {
+					if (ast_fileexists(announce, NULL, chan->language) > 0) {
 						if (!(res = ast_streamfile(chan, announce, chan->language)))
 							res = ast_waitstream(chan, "");
 					} else