Merge branch 'master' into FF/MasterDevel

Moose Development/Moose/Wrapper/Unit.lua

@@ -229,7 +229,7 @@ function UNIT:ReSpawnAt( Coordinate, Heading )
     SpawnGroupTemplate.y = Coordinate.z
     
     self:F( #SpawnGroupTemplate.units )
-    for UnitID, UnitData in pairs( SpawnGroup:GetUnits() ) do
+    for UnitID, UnitData in pairs( SpawnGroup:GetUnits() or {} ) do
       local GroupUnit = UnitData -- #UNIT
       self:F( GroupUnit:GetName() )
       if GroupUnit:IsAlive() then
@@ -630,21 +630,23 @@ end
 -- @param Wrapper.Unit#UNIT self
 -- @return Wrapper.Group#GROUP The Group of the Unit or `nil` if the unit does not exist.  
 function UNIT:GetGroup()
-  self:F2( self.UnitName )
-
-  local DCSUnit = self:GetDCSObject()
-  
-  if DCSUnit then
-    local UnitGroup = GROUP:FindByName( DCSUnit:getGroup():getName() )
+  self:F2( self.UnitName )  
+  local UnitGroup = GROUP:FindByName(self.GroupName)
+  if UnitGroup then
     return UnitGroup
+  else
+    local DCSUnit = self:GetDCSObject()    
+    if DCSUnit then
+      local grp = DCSUnit:getGroup()
+      if grp then
+        local UnitGroup = GROUP:FindByName( grp:getName() )
+        return UnitGroup
+      end
+    end
   end
-
   return nil
 end
 
-
--- Need to add here functions to check if radar is on and which object etc.
-
 --- Returns the prefix name of the DCS Unit. A prefix name is a part of the name before a '#'-sign.
 -- DCS Units spawned with the @{Core.Spawn#SPAWN} class contain a '#'-sign to indicate the end of the (base) DCS Unit name. 
 -- The spawn sequence number and unit number are contained within the name after the '#' sign.