Fixes issue with channel write format being incorrectly restored when MOH is used...
authorDavid Vossel <dvossel@digium.com>
Tue, 21 Jun 2011 21:55:30 +0000 (21:55 +0000)
committerDavid Vossel <dvossel@digium.com>
Tue, 21 Jun 2011 21:55:30 +0000 (21:55 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324422 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_confbridge.c

index 9528bf4..775a628 100644 (file)
@@ -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, "");
                        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);
                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 */
        }
 
        /* Join our conference bridge for real */