Revert "FS-10237 [mod_callcenter] Do not kick member out on timeout if originating...

This reverts commit b4ada1b849d526e3d808fd22626b7d618289c537.

diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c
index 1ca018a12af6365945b4efd2548cc4f750e631ab..7c272db13b1ff2edd9cecfb2597bc1a921c90f83 100644 (file)
--- a/src/mod/applications/mod_callcenter/mod_callcenter.c
+++ b/src/mod/applications/mod_callcenter/mod_callcenter.c
@@ -1675,7 +1675,7 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
                t_agent_called = local_epoch_time_now(NULL);
 
                dialstr = switch_channel_expand_variables(member_channel, h->originate_string);
-               status = switch_ivr_originate(member_session, &agent_session, &cause, dialstr, 60, NULL, cid_name ? cid_name : h->member_cid_name, cid_number ? cid_number : h->member_cid_number, NULL, ovars, SOF_NONE, NULL);
+               status = switch_ivr_originate(NULL, &agent_session, &cause, dialstr, 60, NULL, cid_name ? cid_name : h->member_cid_name, cid_number ? cid_number : h->member_cid_number, NULL, ovars, SOF_NONE, NULL);
 
                /* Search for loopback agent */
                if (status == SWITCH_STATUS_SUCCESS) {
@@ -2737,7 +2737,7 @@ void *SWITCH_THREAD_FUNC cc_member_thread_run(switch_thread_t *thread, void *obj
                        break;
                }
                /* Make the Caller Leave if he went over his max wait time */
-               if (queue->max_wait_time > 0 && queue->max_wait_time <=  time_now - m->t_member_called && !switch_channel_test_flag(member_channel, CF_ORIGINATOR)) {
+               if (queue->max_wait_time > 0 && queue->max_wait_time <=  time_now - m->t_member_called) {
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member_session), SWITCH_LOG_DEBUG, "Member %s <%s> in queue '%s' reached max wait time\n", m->member_cid_name, m->member_cid_number, m->queue_name);
                        m->member_cancel_reason = CC_MEMBER_CANCEL_REASON_TIMEOUT;
                        switch_channel_set_flag_value(member_channel, CF_BREAK, 2);