diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /apps/app_confbridge.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_confbridge.c')
| -rw-r--r-- | apps/app_confbridge.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index a886b5876..8347bc6ed 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -1368,9 +1368,7 @@ static int alloc_playback_chan(struct confbridge_conference *conference) } /* To make sure playback_chan has the same language of that profile */ - ast_channel_lock(conference->playback_chan); ast_channel_language_set(conference->playback_chan, conference->b_profile.language); - ast_channel_unlock(conference->playback_chan); ast_debug(1, "Created announcer channel '%s' to conference bridge '%s'\n", ast_channel_name(conference->playback_chan), conference->name); |