]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix flag
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 23 Sep 2008 21:39:09 +0000 (21:39 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 23 Sep 2008 21:39:09 +0000 (21:39 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9630 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch_ivr_bridge.c

index 400537f978ebb108aabb62b8e9bceae1be4b7000..b97cf750e70dca2a8c09ddced23dbf1bd9af0d8f 100644 (file)
@@ -133,7 +133,6 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 
        switch_channel_set_flag(chan_a, CF_BRIDGED);
 
-
        switch_channel_wait_for_flag(chan_b, CF_BRIDGED, SWITCH_TRUE, 10000, chan_a);
 
        if (!switch_channel_test_flag(chan_b, CF_BRIDGED)) {
@@ -329,7 +328,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
                                if (silence_val) {
                                        switch_generate_sln_silence((int16_t *) silence_frame.data, silence_frame.samples, silence_val);
                                        read_frame = &silence_frame;
-                               } else {
+                               } else if (!switch_channel_test_flag(chan_b, CF_ACCEPT_CNG)) {
                                        continue;
                                }
                        }