[asterisk-commits] dvossel: trunk r324422 - /trunk/apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jun 21 16:55:30 2011
New Revision: 324422

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324422
Log:
Fixes issue with channel write format being incorrectly restored when MOH is used in confbridge.

Modified:
    trunk/apps/app_confbridge.c

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=324422&r1=324421&r2=324422
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Tue Jun 21 16:55:30 2011
@@ -1362,12 +1362,12 @@
 			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 */