diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 22:57:59 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 22:57:59 +0000 |
| commit | 8e743906dc69cae0fbb54ef05571fc981bf6347c (patch) | |
| tree | f46dccc12995af0b6fd3d9bd6cf088edd97ec5de | |
| parent | 2c5a088a6f2f68b533b6b704d9acca30320f0899 (diff) | |
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.4@110163 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 9dbdea821..3a7d923c7 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4353,7 +4353,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"); @@ -4368,7 +4370,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); free(ringing_trunk); pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "UNANSWERED"); /* Queue reprocessing of ringing trunks to make stations stop ringing |