]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
check for answer flag in bridge to do display update properly
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 5 Aug 2011 14:31:21 +0000 (09:31 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 5 Aug 2011 14:31:21 +0000 (09:31 -0500)
src/switch_core.c
src/switch_ivr_bridge.c

index e7cd60d58f2bc2582e3e32612dfe77649eede2e0..37784193b0784a1fa0c86834c5e8bf0a6716d19c 100644 (file)
@@ -1449,7 +1449,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        if (flags & SCF_MINIMAL) return SWITCH_STATUS_SUCCESS;
                                                                                                           
        runtime.tipping_point = 0;
-       runtime.timer_affinity = -1;
+       runtime.timer_affinity = 0;
        runtime.microseconds_per_tick = 20000;
 
        switch_load_core_config("switch.conf");
index b1726e91190680cd44469a02c773d82a99ae0b20..fb8b89096d3565fa904a3fce0b4c9bb7a20ee0c9 100644 (file)
@@ -457,6 +457,8 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
                        }
                }
 
+               if (originator && !ans_b) ans_b = switch_channel_test_flag(chan_b, CF_ANSWERED);
+
                if (originator && !sent_update && ans_a && ans_b && switch_channel_media_ack(chan_a) && switch_channel_media_ack(chan_b)) {
                        switch_ivr_bridge_display(session_a, session_b);
                        sent_update = 1;