Merged revisions 58872 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 13 Mar 2007 23:20:41 +0000 (23:20 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 13 Mar 2007 23:20:41 +0000 (23:20 +0000)
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

apps/app_meetme.c

index b12e2e4..d23c0e9 100644 (file)
@@ -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);
        }