Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

FS-10019

This commit is contained in:
Anthony Minessale 2017-03-08 19:41:48 -06:00
parent 115e69a0c0
commit 53aab765d8
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

@ -425,6 +425,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 (conference->fnode && !switch_test_flag(conference->fnode, NFLAG_PAUSE)) {
/* Lead in time */
@ -531,6 +532,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) {
/* Use more bits in the main_frame to preserve the exact sum of the audio samples. */