]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Consolidate two conditionals
authorTravis Cross <tc@traviscross.com>
Wed, 9 Apr 2014 07:30:14 +0000 (07:30 +0000)
committerTravis Cross <tc@traviscross.com>
Sat, 19 Apr 2014 01:49:25 +0000 (01:49 +0000)
If we get SWITCH_STATUS_BREAK then we didn't get
SWITCH_STATUS_SUCCESS.

src/switch_ivr_play_say.c

index cb9b1fdef17b250f1f3c0f0d7791d07ff42f82e1..150e31a45630cd3ffe11ead323f9a4fab79a8932 100644 (file)
@@ -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;
                }