FS-3675 --resolve incorrect fix in 5dd463532c3d767de17b4f66357805b98f95a805

This commit is contained in:
Anthony Minessale 2011-11-10 10:07:19 -06:00
parent 6fc559effa
commit 3a121a1bff

View File

@ -3452,13 +3452,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (status == SWITCH_STATUS_SUCCESS) {
goto outer_for;
} else {
int ok = 0;
if (fail_on_single_reject && check_reject) {
if (!switch_true(fail_on_single_reject_var)) {
ok = 1;
int ok = 1;
if (fail_on_single_reject && check_reject && !switch_true(fail_on_single_reject_var)) {
for (i = 0; i < and_argc; i++) {
switch_channel_t *pchannel;
const char *cause_str;
@ -3466,8 +3462,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (!originate_status[i].peer_session) {
continue;
}
pchannel = switch_core_session_get_channel(originate_status[i].peer_session);
wait_for_cause(pchannel);
if (switch_channel_down(pchannel)) {
int neg, pos;
@ -3488,9 +3486,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
}
}
}
}
if (ok) {
if (!ok) {
goto outer_for;
}