kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-07 13:35:00 +00:00
Code Issues Projects Releases Wiki Activity

FS-7236: fix mutex use before init error caused by 27c8622

Browse Source
This commit is contained in:
Mike Jerris 2015-02-09 11:23:58 -06:00 committed by Brian West
parent f4e68221de
commit 7c6367052c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/applications/mod_conference/mod_conference.c
View File

@ -9578,12 +9578,6 @@ SWITCH_STANDARD_APP(conference_function)
member.channel = switch_core_session_get_channel(session); member.channel = switch_core_session_get_channel(session);
member.pool = switch_core_session_get_pool(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"))) { if (!(mid = switch_channel_get_private(channel, "__confmid"))) {
mid = switch_core_session_alloc(session, sizeof(*mid)); mid = switch_core_session_alloc(session, sizeof(*mid));
*mid = next_member_id(); *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 */ /* Install our Signed Linear codec so we get the audio in that format */
switch_core_session_set_read_codec(member.session, &member.read_codec); switch_core_session_set_read_codec(member.session, &member.read_codec);
if (setup_media(&member, conference)) {
//flags = 0;
goto done;
}
mflags = conference->mflags; mflags = conference->mflags;
set_mflags(flags_str, &mflags); set_mflags(flags_str, &mflags);