Revision
16706
Author
anthm
Date
2010-02-19 12:59:10 -0600 (Fri, 19 Feb 2010)

Log Message

FSCORE-554

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_ivr_play_say.c (16705 => 16706)


--- freeswitch/trunk/src/switch_ivr_play_say.c	2010-02-19 18:53:02 UTC (rev 16705)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	2010-02-19 18:59:10 UTC (rev 16706)
@@ -1732,22 +1732,19 @@
 			status = SWITCH_STATUS_SUCCESS;
 		}
 
-		if (status == SWITCH_STATUS_TOO_SMALL && strlen(digit_buffer) == 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-
-		if (status == SWITCH_STATUS_SUCCESS) {
-			if (!zstr(digit_buffer)) {
-				if (zstr(digits_regex)) {
-					return SWITCH_STATUS_SUCCESS;
+		if (!(status == SWITCH_STATUS_TOO_SMALL && strlen(digit_buffer) == 0)) {
+			if (status == SWITCH_STATUS_SUCCESS) {
+				if (!zstr(digit_buffer)) {
+					if (zstr(digits_regex)) {
+						return SWITCH_STATUS_SUCCESS;
+					}
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Test Regex [%s][%s]\n", digit_buffer, digits_regex);
+					if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) {
+						return SWITCH_STATUS_SUCCESS;
+					} else {
+						switch_channel_set_variable(channel, var_name, NULL);
+					}
 				}
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Test Regex [%s][%s]\n", digit_buffer, digits_regex);
-				if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) {
-					return SWITCH_STATUS_SUCCESS;
-				} else {
-					switch_channel_set_variable(channel, var_name, NULL);
-				}
 			}
 		}