kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 86328 via svnmerge from

Browse Source 
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
This commit is contained in:
Mark Michelson
2007-10-18 17:40:45 +00:00
parent 37c1943b87
commit 934b814add
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_queue.c
View File

@@ -1621,7 +1621,7 @@ posout:
res = play_file(qe->chan, qe->parent->sound_thanks); res = play_file(qe->chan, qe->parent->sound_thanks);
playout: playout:
if (res > 0 && !valid_exit(qe, res)) if ((res > 0 && !valid_exit(qe, res)) || res < 0)
res = 0; res = 0;
/* Set our last_pos indicators */ /* Set our last_pos indicators */
@@ -2065,7 +2065,7 @@ static int say_periodic_announcement(struct queue_ent *qe, int ringing)
/* play the announcement */ /* play the announcement */
res = play_file(qe->chan, qe->parent->sound_periodicannounce[qe->last_periodic_announce_sound]); 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; res = 0;
/* Resume Music on Hold if the caller is going to stay in the queue */ /* Resume Music on Hold if the caller is going to stay in the queue */