From 7c6367052cc35c457cf6bcee49e473e744422d29 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Mon, 9 Feb 2015 11:23:58 -0600 Subject: [PATCH] FS-7236: fix mutex use before init error caused by 27c8622 --- src/mod/applications/mod_conference/mod_conference.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index c8dc8336b6..f296844a2c 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -9578,12 +9578,6 @@ SWITCH_STANDARD_APP(conference_function) member.channel = switch_core_session_get_channel(session); member.pool = switch_core_session_get_pool(session); - if (setup_media(&member, conference)) { - //flags = 0; - goto done; - } - - if (!(mid = switch_channel_get_private(channel, "__confmid"))) { mid = switch_core_session_alloc(session, sizeof(*mid)); *mid = next_member_id(); @@ -9605,6 +9599,10 @@ SWITCH_STANDARD_APP(conference_function) /* Install our Signed Linear codec so we get the audio in that format */ switch_core_session_set_read_codec(member.session, &member.read_codec); + if (setup_media(&member, conference)) { + //flags = 0; + goto done; + } mflags = conference->mflags; set_mflags(flags_str, &mflags);