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

use menu-timeout instead of menu-inter-digit-timeout when no digits have been entered 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13279 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-05-11 20:20:11 +00:00
parent fb38c20619
commit c1d643900d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/switch_ivr_menu.c
View File

@ -292,6 +292,7 @@ static switch_status_t play_and_collect(switch_core_session_t *session, switch_i
switch_input_args_t args = { 0 }; switch_input_args_t args = { 0 };
switch_channel_t *channel; switch_channel_t *channel;
char *sound_expanded = sound; char *sound_expanded = sound;
switch_size_t menu_buf_len = 0;
if (!session || !menu || switch_strlen_zero(sound)) { if (!session || !menu || switch_strlen_zero(sound)) {
return status; return status;
@ -324,12 +325,14 @@ static switch_status_t play_and_collect(switch_core_session_t *session, switch_i
return status; return status;
} }
menu->ptr += strlen(menu->buf); menu_buf_len = strlen(menu->buf);
if (strlen(menu->buf) < need) {
menu->ptr += menu_buf_len;
if (menu_buf_len < need) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "waiting for %u/%u digits t/o %d\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "waiting for %u/%u digits t/o %d\n",
(uint32_t)(menu->inlen - strlen(menu->buf)), (uint32_t)need, menu->inter_timeout); (uint32_t)(menu->inlen - strlen(menu->buf)), (uint32_t)need, menu->inter_timeout);
status = switch_ivr_collect_digits_count(session, menu->ptr, menu->inlen - strlen(menu->buf), status = switch_ivr_collect_digits_count(session, menu->ptr, menu->inlen - strlen(menu->buf),
need, "#", &terminator, menu->inter_timeout, 0, 0); need, "#", &terminator, menu_buf_len ? menu->inter_timeout : menu->timeout, 0, 0);
} }
if (menu->confirm_macro && status == SWITCH_STATUS_SUCCESS && *menu->buf != '\0') { if (menu->confirm_macro && status == SWITCH_STATUS_SUCCESS && *menu->buf != '\0') {