mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 03:48:02 +00:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user