kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-04 17:51:03 +00:00
Code Issues Projects Releases Wiki Activity

FS-10019

Browse Source
This commit is contained in:
Anthony Minessale 2017-03-08 19:41:48 -06:00
parent 334ae30484
commit 893f3ace64
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,6 +389,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
} }
} }
switch_mutex_lock(conference->file_mutex);
/* If a file or speech event is being played */ /* If a file or speech event is being played */
if (conference->fnode && !switch_test_flag(conference->fnode, NFLAG_PAUSE)) { if (conference->fnode && !switch_test_flag(conference->fnode, NFLAG_PAUSE)) {
/* Lead in time */ /* Lead in time */
@ -495,6 +496,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
} }
} }
} }
switch_mutex_lock(conference->file_mutex);
if (ready || has_file_data) { if (ready || has_file_data) {
/* Use more bits in the main_frame to preserve the exact sum of the audio samples. */ /* Use more bits in the main_frame to preserve the exact sum of the audio samples. */