]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10019
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 9 Mar 2017 01:41:48 +0000 (19:41 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 9 Mar 2017 01:41:48 +0000 (19:41 -0600)
src/mod/applications/mod_conference/mod_conference.c

index dcb03eec331bf83dc77ab3a2d9db74530de7b01f..332857fc8303c37c3939ae53b490afadc1f6fa02 100644 (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. */