From e6ab1aa5d9caed64efde1b822825d82206a26930 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 16 Mar 2017 12:25:47 -0400
Subject: [PATCH 1/3] HOR-2876

---
 workflow/engine/src/ProcessMaker/Core/RoutingScreen.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
index dafe61a98..cce646e47 100644
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -109,7 +109,13 @@ class RoutingScreen extends \Derivation
                     }
                 }
                 if ($delete) {
-                    unset($response[$index]);
+                    $thereIsNoTask = true;
+                    if ($response[$index]["NEXT_TASK"]["TAS_UID"] === "-1") {
+                        $thereIsNoTask = false;
+                    }
+                    if ($thereIsNoTask === true) {
+                        unset($response[$index]);
+                    }
                 }
             }
         }

From 82c1695531479f2f7a9516f107cbddaaa2bb9428 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 16 Mar 2017 12:38:58 -0400
Subject: [PATCH 2/3] HOR-2876 pull request note

---
 .../engine/src/ProcessMaker/Core/RoutingScreen.php     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
index cce646e47..ba14791bd 100644
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -108,14 +108,8 @@ class RoutingScreen extends \Derivation
                         $delete = true;
                     }
                 }
-                if ($delete) {
-                    $thereIsNoTask = true;
-                    if ($response[$index]["NEXT_TASK"]["TAS_UID"] === "-1") {
-                        $thereIsNoTask = false;
-                    }
-                    if ($thereIsNoTask === true) {
-                        unset($response[$index]);
-                    }
+                if ($delete && $response[$index]["NEXT_TASK"]["TAS_UID"] !== "-1") {
+                    unset($response[$index]);
                 }
             }
         }

From 045e1fd1a82214cb62f40c7996f6a3c6b39e495d Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 16 Mar 2017 14:49:22 -0400
Subject: [PATCH 3/3] HOR-2876 pull request note

---
 workflow/engine/src/ProcessMaker/Core/RoutingScreen.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
index ba14791bd..0bf763fd6 100644
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -108,7 +108,7 @@ class RoutingScreen extends \Derivation
                         $delete = true;
                     }
                 }
-                if ($delete && $response[$index]["NEXT_TASK"]["TAS_UID"] !== "-1") {
+                if ($delete && $response[$index]["NEXT_TASK"]["TAS_UID"] === "-1") {
                     unset($response[$index]);
                 }
             }