diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 23:00:23 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 23:00:23 +0000 |
| commit | 30db73392856ea39de1806c5e10897431299cd35 (patch) | |
| tree | 81cef4695b548af9b915d1ed79e6bb4929192fc5 /apps/app_meetme.c | |
| parent | e53de1af452d43561989d7c6f6e70855809f29a0 (diff) | |
Merged revisions 110164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r110164 | russell | 2008-03-19 17:58:33 -0500 (Wed, 19 Mar 2008) | 13 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@110165 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a6967a34c..6a74f36ea 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 |