diff options
| author | Mark Michelson <mmichelson@digium.com> | 2007-10-18 17:40:45 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2007-10-18 17:40:45 +0000 |
| commit | 934b814addbc013d7d58e41560da02e8fefc81ad (patch) | |
| tree | c69b47d1dc185f21e75c95d7deff43bc5bc17be0 /apps/app_queue.c | |
| parent | 37c1943b87c5c77e561f0ce8e0d4d51f5c2b2834 (diff) | |
Merged revisions 86328 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r86328 | mmichelson | 2007-10-18 12:38:26 -0500 (Thu, 18 Oct 2007) | 5 lines
If a non-existent file is specified to be played either as a periodic announcement
or as a hold/position announcement, the caller would be kicked out of the queue.
No longer does this happen.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 00b44a363..bc1b5d4b6 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1621,7 +1621,7 @@ posout: res = play_file(qe->chan, qe->parent->sound_thanks); playout: - if (res > 0 && !valid_exit(qe, res)) + if ((res > 0 && !valid_exit(qe, res)) || res < 0) res = 0; /* Set our last_pos indicators */ @@ -2065,7 +2065,7 @@ static int say_periodic_announcement(struct queue_ent *qe, int ringing) /* play the announcement */ res = play_file(qe->chan, qe->parent->sound_periodicannounce[qe->last_periodic_announce_sound]); - if (res > 0 && !valid_exit(qe, res)) + if ((res > 0 && !valid_exit(qe, res)) || res < 0) res = 0; /* Resume Music on Hold if the caller is going to stay in the queue */ |