From 013db1d42fcc6b925137f44f0c5f4d196502ee04 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 19 Mar 2008 22:58:33 +0000 Subject: Merged revisions 110163 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110163 | russell | 2008-03-19 17:57:59 -0500 (Wed, 19 Mar 2008) | 5 lines Fix a bug where when calls on the trunk side hang up while on hold, the state is not properly reflected. (closes issue #11990, reported by anakaoka, patched by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110164 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index bda9050c8..b83853fe6 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -5077,7 +5077,9 @@ static int sla_trunk_exec(struct ast_channel *chan, void *data) conf = NULL; trunk->chan = NULL; trunk->on_hold = 0; - + + sla_change_trunk_state(trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL); + if (!pbx_builtin_getvar_helper(chan, "SLATRUNK_STATUS")) pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS"); @@ -5092,7 +5094,6 @@ 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); ast_free(ringing_trunk); pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "UNANSWERED"); /* Queue reprocessing of ringing trunks to make stations stop ringing -- cgit v1.2.3