From 0b1ac40a150c46cd2c083bf565aaf1a40764bfdc Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 28 Oct 2013 10:20:42 -0500 Subject: [PATCH] revert --- src/switch_ivr_async.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c index 3adf73196f..3bf20b5839 100644 --- a/src/switch_ivr_async.c +++ b/src/switch_ivr_async.c @@ -476,6 +476,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t * switch_bool_t is_timeout = switch_ivr_dmachine_check_timeout(dmachine); dm_match_t is_match = switch_ivr_dmachine_check_match(dmachine, is_timeout); switch_status_t r, s; + int clear = 0; if (is_match == DM_MATCH_NEVER) { is_timeout++; @@ -503,7 +504,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t * dmachine->is_match = 1; dmachine->match.type = DM_MATCH_POSITIVE; - switch_ivr_dmachine_clear(dmachine); if (dmachine->last_matching_binding->callback) { s = dmachine->last_matching_binding->callback(&dmachine->match); @@ -537,6 +537,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t * } + clear++; } else if (is_timeout) { r = SWITCH_STATUS_TIMEOUT; } else if (is_match == DM_MATCH_NONE && dmachine->cur_digit_len == dmachine->max_digit_len) { @@ -546,7 +547,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t * } if (r != SWITCH_STATUS_FOUND && r != SWITCH_STATUS_SUCCESS && r != SWITCH_STATUS_BREAK) { - switch_ivr_dmachine_clear(dmachine); switch_set_string(dmachine->last_failed_digits, dmachine->digits); dmachine->match.match_digits = dmachine->last_failed_digits; @@ -569,8 +569,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t * } + clear++; } - + + if (clear) { + switch_ivr_dmachine_clear(dmachine); + } + dmachine->last_return = r; switch_mutex_unlock(dmachine->mutex);