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

FS-4867 try patch

This commit is contained in:
Anthony Minessale 2012-12-06 12:43:00 -06:00
parent a7fafb2039
commit e5fd435f11
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_core_io.c
View File

@ -151,10 +151,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
for(i = 0; i < 2; i++) { for(i = 0; i < 2; i++) {
if (session->dmachine[i] && !switch_channel_test_flag(session->channel, CF_BROADCAST)) { if (session->dmachine[i] && !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
if (switch_channel_try_dtmf_lock(session->channel) == SWITCH_STATUS_SUCCESS) { switch_ivr_dmachine_ping(session->dmachine[i], NULL);
switch_ivr_dmachine_ping(session->dmachine[i], NULL);
switch_channel_dtmf_unlock(session->channel);
}
} }
} }

4
src/switch_ivr_async.c
View File

@ -426,7 +426,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t *
is_timeout++; is_timeout++;
} }
switch_mutex_lock(dmachine->mutex); if (switch_mutex_trylock(dmachine->mutex) != SWITCH_STATUS_SUCCESS) {
return SWITCH_STATUS_SUCCESS;
}
if (zstr(dmachine->digits) && !is_timeout) { if (zstr(dmachine->digits) && !is_timeout) {
r = SWITCH_STATUS_SUCCESS; r = SWITCH_STATUS_SUCCESS;