diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-20 08:11:54 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-20 08:11:54 -0600 |
| commit | b1002338018a37043096d0b6bbe2854bc36d68cc (patch) | |
| tree | 4b2fd3847471f64513f2d775fd7b5c3913b652f0 | |
| parent | 2072057657d5dba665b2854f63372efbf695ccb4 (diff) | |
| parent | fef23297b746ac994466f61ee030eb780d497ae3 (diff) | |
Merge "bridge: Stop music on hold on adding an arbitrary channel to a bridge" into 13
| -rw-r--r-- | main/bridge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/bridge.c b/main/bridge.c index f689b297f..5e065fb35 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -2495,6 +2495,8 @@ int ast_bridge_add_channel(struct ast_bridge *bridge, struct ast_channel *chan, RAII_VAR(struct ast_bridge *, chan_bridge, NULL, ao2_cleanup); RAII_VAR(struct ast_channel *, yanked_chan, NULL, ao2_cleanup); + ast_moh_stop(chan); + ast_channel_lock(chan); chan_bridge = ast_channel_get_bridge(chan); ast_channel_unlock(chan); |