]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
only honor hangup_after_bridge=true if the channel is answered
authorAnthony Minessale <anthony.minessale@gmail.com>
Wed, 10 Oct 2007 17:41:08 +0000 (17:41 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Wed, 10 Oct 2007 17:41:08 +0000 (17:41 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5836 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch_ivr_bridge.c

index 3077fafc7c8afb3d4249bc592740cd1e2292b08a..15ed086edde11eb29fdf44f677797676354b9109 100644 (file)
@@ -458,7 +458,7 @@ static switch_status_t signal_bridge_on_hangup(switch_core_session_t *session)
                switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL);
                switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL);
 
-               if (switch_channel_get_state(other_channel) < CS_HANGUP
+               if (switch_channel_test_flag(other_channel, CF_ANSWERED) && switch_channel_get_state(other_channel) < CS_HANGUP
                        && switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) {
                        switch_channel_hangup(other_channel, switch_channel_get_cause(channel));
                } else {
@@ -671,7 +671,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
 
   done:
 
-       if (switch_channel_get_state(caller_channel) < CS_HANGUP && 
+       if (switch_channel_test_flag(caller_channel, CF_ANSWERED) && switch_channel_get_state(caller_channel) < CS_HANGUP && 
                switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) {
                switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel));
        }