From: Travis Cross <tc@traviscross.com>
Date: Wed, 9 Apr 2014 07:30:14 +0000 (+0000)
Subject: Consolidate two conditionals
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beca9eff9dd7eed4f6d872235c4b6c72125bdc1e;p=thirdparty%2Ffreeswitch.git

Consolidate two conditionals

If we get SWITCH_STATUS_BREAK then we didn't get
SWITCH_STATUS_SUCCESS.
---

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index cb9b1fdef1..150e31a456 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -320,11 +320,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro_event(switch_core_sessio
 		switch_regex_safe_free(re);
 		switch_safe_free(field_expanded_alloc);
 
-		if ((match && do_break && switch_true(do_break)) || status == SWITCH_STATUS_BREAK) {
-			break;
-		}
-
-		if (status != SWITCH_STATUS_SUCCESS) {
+		if ((match && do_break && switch_true(do_break))
+			|| status != SWITCH_STATUS_SUCCESS) {
 			break;
 		}