]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-6181 --resolve
authorChris Rienzo <chris@rienzo.com>
Wed, 5 Feb 2014 21:59:34 +0000 (16:59 -0500)
committerChris Rienzo <chris@rienzo.com>
Wed, 5 Feb 2014 22:00:19 +0000 (17:00 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 6861b2737bfffdb114ed4aa7b643ac0b7af8997b..f3260687a99f309c404cefc649449f4262c97f2a 100644 (file)
@@ -3906,7 +3906,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
                /* skip frames that are not actual media or when we are muted or silent */
                if ((switch_test_flag(member, MFLAG_TALKING) || member->energy_level == 0 || switch_test_flag(member->conference, CFLAG_AUDIO_ALWAYS)) 
                        && switch_test_flag(member, MFLAG_CAN_SPEAK) && !switch_test_flag(member->conference, CFLAG_WAIT_MOD)
-                       && (member->conference->count > 1 || member->conference->record_count >= member->conference->min_recording_participants)) {
+                       && (member->conference->count > 1 || (member->conference->record_count && member->conference->count >= member->conference->min_recording_participants))) {
                        switch_audio_resampler_t *read_resampler = member->read_resampler;
                        void *data;
                        uint32_t datalen;