[svn-commits] mmichelson: branch 1.4 r205349 - /branches/1.4/apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul  8 14:26:13 2009
New Revision: 205349

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205349
Log:
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)


Modified:
    branches/1.4/apps/app_queue.c

Modified: branches/1.4/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/apps/app_queue.c?view=diff&rev=205349&r1=205348&r2=205349
==============================================================================
--- branches/1.4/apps/app_queue.c (original)
+++ branches/1.4/apps/app_queue.c Wed Jul  8 14:26:13 2009
@@ -1648,7 +1648,8 @@
 	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 */
@@ -2123,7 +2124,7 @@
 	/* play the announcement */
 	res = play_file(qe->chan, 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 */