From: David Vossel <dvossel@digium.com>
Date: Tue, 21 Jun 2011 21:55:30 +0000 (+0000)
Subject: Fixes issue with channel write format being incorrectly restored when MOH is used... 
X-Git-Tag: 11.0.0-beta1~1446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=698bc0257090ddf8f9e930215bbf28b972082271;p=thirdparty%2Fasterisk.git

Fixes issue with channel write format being incorrectly restored when MOH is used in confbridge.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 9528bf4808..775a628ba9 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 */