From c3ecf51468764c9d6cd162022df0e663ce0ca389 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 1 Jun 2022 07:44:02 +0000
Subject: [PATCH] Add checking for current job order. #675

---
 .../JobOrderHandler/ResqJobOrderHandler.php    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 928b609d..95f7d141 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -1398,9 +1398,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $old_rider = $obj->getRider();
             if ($old_rider != null)
             {
-                $old_rider->setCurrentJobOrder();
-                // set available flag for first rider
-                $old_rider->setAvailable(true);
+                if ($old_rider->getCurrentJobOrder() != null)
+                {
+                    $old_rider->setCurrentJobOrder();
+                    // set available flag for first rider
+                    $old_rider->setAvailable(true);
+                }
             }
 
             // coordinates
@@ -1657,9 +1660,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $old_rider = $obj->getRider();
             if ($old_rider != null)
             {
-                $old_rider->setCurrentJobOrder();
-                // set available flag for first rider
-                $old_rider->setAvailable(true);
+                if ($old_rider->getCurrentJobOrder() != null)
+                {
+                    $old_rider->setCurrentJobOrder();
+                    // set available flag for first rider
+                    $old_rider->setAvailable(true); 
+                }
             }
 
             // coordinates