Fixes an issue with MOH where it doesn't recover cleanly when it can't play a file...

(closes issue #17807)
Reported by: kshumard

Review: https://reviewboard.asterisk.org/r/910/

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 271779461e8d00f271ee92b62fd51d718fed3385..f67fa5a1ccb1ae24a28516cf8e9a8f29eb36271e 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -250,10 +250,17 @@ static int ast_moh_files_next(struct ast_channel *chan)
                state->samples = 0;
        }
 
-       if (!ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) {
+       for (tries = 0; tries < state->class->total_files; ++tries) {
+               if (ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) {
+                       break;
+               }
+
                ast_log(LOG_WARNING, "Unable to open file '%s': %s\n", state->class->filearray[state->pos], strerror(errno));
                state->pos++;
                state->pos %= state->class->total_files;
+       }
+
+       if (tries == state->class->total_files) {
                return -1;
        }