From 4252f9baaca5c080c32f8faa22e652fe62f16016 Mon Sep 17 00:00:00 2001
From: FlightControl <sven.van.de.velde@telenet.be>
Date: Thu, 13 Jul 2017 21:41:58 +0200
Subject: [PATCH] Fixed problem with crash in Detection.lua.

When DetectionObject is nil (this can be), or is destroyed in between
detections, then nil must be returned and IsDetectedObjectIdentified is
not required to be checked.
---
 .../Moose/Functional/Detection.lua            | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua
index c3f978b81..11583bd23 100644
--- a/Moose Development/Moose/Functional/Detection.lua	
+++ b/Moose Development/Moose/Functional/Detection.lua	
@@ -1250,19 +1250,23 @@ do -- DETECTION_BASE
   -- @param #DETECTION_BASE.DetectedObject DetectedObject
   -- @return #boolean true if already identified.
   function DETECTION_BASE:IsDetectedObjectIdentified( DetectedObject )
-    self:F3( DetectedObject.Name )
+    --self:F3( DetectedObject.Name )
   
     local DetectedObjectName = DetectedObject.Name
-    local DetectedObjectIdentified = self.DetectedObjectsIdentified[DetectedObjectName] == true
-    self:T3( DetectedObjectIdentified )
-    return DetectedObjectIdentified
+    if DetectedObjectName then
+      local DetectedObjectIdentified = self.DetectedObjectsIdentified[DetectedObjectName] == true
+      self:T3( DetectedObjectIdentified )
+      return DetectedObjectIdentified
+    else
+      return nil
+    end
   end
   
   --- Identifies a detected object during detection processing.
   -- @param #DETECTION_BASE self
   -- @param #DETECTION_BASE.DetectedObject DetectedObject
   function DETECTION_BASE:IdentifyDetectedObject( DetectedObject )
-    self:F( { "Identified:", DetectedObject.Name } )
+    --self:F( { "Identified:", DetectedObject.Name } )
   
     local DetectedObjectName = DetectedObject.Name
     self.DetectedObjectsIdentified[DetectedObjectName] = true
@@ -1289,16 +1293,18 @@ do -- DETECTION_BASE
   -- @param #string ObjectName
   -- @return #DETECTION_BASE.DetectedObject
   function DETECTION_BASE:GetDetectedObject( ObjectName )
-  	self:F2( ObjectName )
+  	--self:F2( ObjectName )
     
     if ObjectName then
       local DetectedObject = self.DetectedObjects[ObjectName]
-  
-      -- Only return detected objects that are alive!
-      local DetectedUnit = UNIT:FindByName( ObjectName )
-      if DetectedUnit and DetectedUnit:IsAlive() then
-        if self:IsDetectedObjectIdentified( DetectedObject ) == false then
-          return DetectedObject
+      
+      if DetectedObject then
+        -- Only return detected objects that are alive!
+        local DetectedUnit = UNIT:FindByName( ObjectName )
+        if DetectedUnit and DetectedUnit:IsAlive() then
+          if self:IsDetectedObjectIdentified( DetectedObject ) == false then
+            return DetectedObject
+          end
         end
       end
     end