From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 6 Apr 2007 19:52:12 +0000 (+0000)
Subject: Merged revisions 60565 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2896
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3192c77f2e1afacef8ce5a20ee14ef70c1aba9e;p=thirdparty%2Fasterisk.git

Merged revisions 60565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r60565 | russell | 2007-04-06 14:50:52 -0500 (Fri, 06 Apr 2007) | 3 lines

When a station picks up a trunk that was on hold, make the hints reflect that
nobody has the trunk on hold anymore.

........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 16fb31b277..c4d516829f 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4192,6 +4192,7 @@ static int sla_station_exec(struct ast_channel *chan, void *data)
 		trunk_ref->trunk->on_hold) {
 		trunk_ref->trunk->on_hold = 0;
 		ast_indicate(trunk_ref->trunk->chan, AST_CONTROL_UNHOLD);
+		sla_change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_UP, ALL_TRUNK_REFS, NULL);
 	}
 
 	snprintf(conf_name, sizeof(conf_name), "SLA_%s", trunk_ref->trunk->name);