From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 13 Mar 2007 23:20:41 +0000 (+0000)
Subject: Merged revisions 58872 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3013
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bf6ed59db4205f9e6b5e996a35461e4b2d6e115;p=thirdparty%2Fasterisk.git

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)

........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b12e2e4a96..d23c0e94f2 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4249,8 +4249,11 @@ static int sla_trunk_exec(struct ast_channel *chan, void *data)
 	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);
 	}