diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-20 08:34:51 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-20 08:34:51 -0600 |
| commit | 0b9396720a6bd4da7b63a562685522eb63c0e224 (patch) | |
| tree | baacfa19c5a94fc3ea106cc00df4b4b7b25ca6e8 | |
| parent | a711ac25f1b6364552aa4fd09d1a16d303fd28f1 (diff) | |
| parent | 3b99a0332cae6f82e1961750fce44b7f1ac09b3a (diff) | |
Merge "bridge: Stop music on hold on adding an arbitrary channel to a bridge"
| -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 5d9c0c1f7..7a937ea59 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -2511,6 +2511,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); |