[asterisk-commits] mmichelson: trunk r205350 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul  8 14:26:55 2009
New Revision: 205350

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_queue.c?view=diff&rev=205350&r1=205349&r2=205350
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Wed Jul  8 14:26:55 2009
@@ -2344,7 +2344,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 */
@@ -2919,7 +2920,7 @@
 	/* 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 */