Merged revisions 205349 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r205349 | mmichelson | 2009-07-08 14:26:13 -0500 (Wed, 08 Jul 2009) | 14 lines

  Prevent phantom calls to queue members.

  If a caller were to hang up while a periodic announcement or position
  were being said, the return value for those functions would incorrectly
  indicate that the caller was still in the queue. With these changes,
  the problem does not occur.

  (closes issue #14631)
  Reported by: latinsud
  Patches:
        queue_announce_ghost_call2.diff uploaded by latinsud (license 745)
  	  (with small modification from me)
........

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index aa3564a..efdbf9c 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2344,7 +2344,8 @@ posout:
                res = play_file(qe->chan, qe->parent->sound_thanks);
        }
 playout:
-       if ((res > 0 && !valid_exit(qe, res)) || res < 0)
+
+       if ((res > 0 && !valid_exit(qe, res)))
                res = 0;
 
        /* Set our last_pos indicators */
@@ -2919,7 +2920,7 @@ static int say_periodic_announcement(struct queue_ent *qe, int ringing)
        /* play the announcement */
        res = play_file(qe->chan, ast_str_buffer(qe->parent->sound_periodicannounce[qe->last_periodic_announce_sound]));
 
-       if ((res > 0 && !valid_exit(qe, res)) || res < 0)
+       if (res > 0 && !valid_exit(qe, res))
                res = 0;
 
        /* Resume Music on Hold if the caller is going to stay in the queue */