diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-30 11:21:52 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-30 11:21:52 +0000 |
| commit | 497d2513ddc1f1977e236b4f54e68f5108fd5f0e (patch) | |
| tree | d57fd60c53855026d301c3377ff8e0433483ad59 /channels | |
| parent | 9dd8425cfa0d17107c61f93968ac530e3557ce13 (diff) | |
Merged revisions 101152 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r101152 | oej | 2008-01-30 12:20:31 +0100 (Ons, 30 Jan 2008) | 7 lines
Stop musiconhold on attended transfer.
(closes issue #11872)
Reported by: gareth
Patches:
svn-101018.patch uploaded by gareth (license 208)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@101153 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 919dd358b..d6f4a05af 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15430,7 +15430,9 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct static void ast_quiet_chan(struct ast_channel *chan) { if (chan && chan->_state == AST_STATE_UP) { - if (chan->generatordata) + if (ast_test_flag(chan, AST_FLAG_MOH)) + ast_moh_stop(chan); + else if (chan->generatordata) ast_deactivate_generator(chan); } } |