[asterisk-commits] russell: trunk r58873 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 13 18:20:41 2007
New Revision: 58873

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58873
Log:
Merged revisions 58872 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58872 | russell | 2007-03-13 18:19:51 -0500 (Tue, 13 Mar 2007) | 4 lines

Ensure that the blinky lights show that the trunk stopped ringing when the
trunk hangs up before a station has answered it.
(issue #9234, reported by francesco_r)

........

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

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

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=58873&r1=58872&r2=58873
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue Mar 13 18:20:41 2007
@@ -4249,8 +4249,11 @@
 	AST_LIST_TRAVERSE_SAFE_END
 	ast_mutex_unlock(&sla.lock);
 	if (ringing_trunk) {
+		sla_change_trunk_state(ringing_trunk->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL);
 		free(ringing_trunk);
 		pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "UNANSWERED");
+		/* Queue reprocessing of ringing trunks to make stations stop ringing
+		 * that shouldn't be ringing after this trunk stopped. */
 		sla_queue_event(SLA_EVENT_RINGING_TRUNK);
 	}