diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-21 21:55:30 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-21 21:55:30 +0000 |
| commit | cb5d7f338b1d635294ef70bd48bfe11cece6f16e (patch) | |
| tree | 4d0e0b67b4089954d82d2cd7cf811523d7fe9a51 /apps | |
| parent | e30177b43f6c7b0eeade9c0831b82a71e2aaf418 (diff) | |
Fixes issue with channel write format being incorrectly restored when MOH is used in confbridge.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@324422 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_confbridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 9528bf480..775a628ba 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -1362,12 +1362,12 @@ static int confbridge_exec(struct ast_channel *chan, const char *data) ast_moh_stop(chan); } ast_stream_and_wait(chan, join_sound, ""); - if (conference_bridge_user.playing_moh) { - ast_moh_start(chan, conference_bridge_user.u_profile.moh_class, NULL); - } ast_autoservice_start(chan); play_sound_file(conference_bridge, join_sound); ast_autoservice_stop(chan); + if (conference_bridge_user.playing_moh) { + ast_moh_start(chan, conference_bridge_user.u_profile.moh_class, NULL); + } } /* Join our conference bridge for real */ |