kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-4038 can you try this

This commit is contained in:
Anthony Minessale 2012-04-02 16:03:37 -05:00
parent 139dc3e34e
commit 6138fc8753
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_channel.c
View File

@ -1380,7 +1380,7 @@ SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, sw
for (;;) { for (;;) {
if ((channel->state < CS_HANGUP && channel->state == channel->running_state && channel->running_state == want_state) || if ((channel->state < CS_HANGUP && channel->state == channel->running_state && channel->running_state == want_state) ||
(other_channel && switch_channel_down_nosig(other_channel)) || switch_channel_down_nosig(channel)) { (other_channel && switch_channel_down_nosig(other_channel)) || switch_channel_down(channel)) {
break; break;
} }
switch_yield(20000); switch_yield(20000);
@ -1399,6 +1399,8 @@ SWITCH_DECLARE(void) switch_channel_wait_for_state_timeout(switch_channel_t *cha
break; break;
} }
switch_channel_check_signal(channel, SWITCH_TRUE);
switch_cond_next(); switch_cond_next();
if (++count >= timeout) { if (++count >= timeout) {

2
src/switch_ivr_bridge.c
View File

@ -776,7 +776,7 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
state = switch_channel_get_state(other_channel); state = switch_channel_get_state(other_channel);
running_state = switch_channel_get_running_state(other_channel); running_state = switch_channel_get_running_state(other_channel);
if (switch_channel_down_nosig(other_channel) || switch_channel_down_nosig(channel)) { if (switch_channel_down_nosig(other_channel) || switch_channel_down(channel)) {
break; break;
} }