diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-24 16:48:05 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-24 16:48:05 +0000 |
commit | 74bfb6e0b5a640e6f55d38e1a71fcc2b5de17c87 (patch) | |
tree | 72775951901f5e95349fe3ab479aa8447cbcd97b | |
parent | 5a80cfcedc6ffdde2acbad3ee406fc3e937b7284 (diff) |
Merged revisions 114612 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114612 | qwell | 2008-04-24 11:47:01 -0500 (Thu, 24 Apr 2008) | 17 lines
Merged revisions 51989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #12496)
Reported by: daniele
Patches:
misdn-moh-1.6.0-beta7.1.patch uploaded by daniele (license 471)
Tested by: daniele
Technically, I didn't use the patch above except to find out what revision to merge - but it's the same thing as this revision.
........
r51989 | crichter | 2007-01-24 06:57:22 -0600 (Wed, 24 Jan 2007) | 1 line
added fix from #8899
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114613 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_misdn.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 1a5d671e1..0f164031e 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2533,9 +2533,11 @@ static int misdn_indication(struct ast_channel *ast, int cond, const void *data, start_bc_tones(p); break; case AST_CONTROL_HOLD: + ast_moh_start(ast,data,ast->musicclass); chan_misdn_log(1, p->bc->port, " --> *\tHOLD pid:%d\n", p->bc ? p->bc->pid : -1); break; case AST_CONTROL_UNHOLD: + ast_moh_stop(ast); chan_misdn_log(1, p->bc->port, " --> *\tUNHOLD pid:%d\n", p->bc ? p->bc->pid : -1); break; default: |