aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-22 17:14:39 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-22 17:14:39 +0000
commit19857c026a17731bc5c711ceee5e9ed36758ffce (patch)
tree04fa8814c9b21639f12e55b511e0961882d021f5 /apps
parent6a858d35cc15d74cd74bd123151018d30f3b4f7f (diff)
Merged revisions 225360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r225360 | tilghman | 2009-10-22 12:11:23 -0500 (Thu, 22 Oct 2009) | 11 lines Merged revisions 225105 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r225105 | tilghman | 2009-10-21 11:02:12 -0500 (Wed, 21 Oct 2009) | 4 lines Fix documentation for ast_softhangup() and correct the misuse thereof. (closes issue #16103) Reported by: majorbloodnok ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@225362 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0f73333a2..9b2a693a9 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4595,7 +4595,7 @@ static void sla_handle_hold_event(struct sla_event *event)
ast_indicate(event->trunk_ref->trunk->chan, AST_CONTROL_HOLD);
}
- ast_softhangup(event->trunk_ref->chan, AST_CAUSE_NORMAL);
+ ast_softhangup(event->trunk_ref->chan, AST_SOFTHANGUP_DEV);
event->trunk_ref->chan = NULL;
}