From ef217c0b19def47fbc7c39286777c45b347647da Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sun, 18 Jun 2017 09:00:48 +0200 Subject: [PATCH] Fix for CTD in DCS 2.1. Destroyed scenery object cannot be inspected with all the methods. SceneryObject:getTypeName() goes into CTD with the scenery has been destroyed. The problem was in the event handler (Event.lua). This is fixed by checking if the SceneryObject exists before getting the type name. If it does not exist, the type name is filled with "SCENERY". --- Moose Development/Moose/Core/Event.lua | 2 +- Moose Mission Setup/Moose.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua index f9da8ec67..73f82342f 100644 --- a/Moose Development/Moose/Core/Event.lua +++ b/Moose Development/Moose/Core/Event.lua @@ -810,7 +810,7 @@ function EVENT:onEvent( Event ) Event.IniUnitName = Event.IniDCSUnitName Event.IniUnit = SCENERY:Register( Event.IniDCSUnitName, Event.initiator ) Event.IniCategory = Event.IniDCSUnit:getDesc().category - Event.IniTypeName = Event.IniDCSUnit:getTypeName() + Event.IniTypeName = Event.initiator:isExist() and Event.IniDCSUnit:getTypeName() or "SCENERY" -- TODO: Bug fix for 2.1! end end diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index e39cd3f7a..fae94236f 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170518_2056' ) +env.info( 'Moose Generation Timestamp: 20170618_0858' ) --- Various routines -- @module routines @@ -5070,7 +5070,7 @@ function EVENT:onEvent( Event ) Event.IniUnitName = Event.IniDCSUnitName Event.IniUnit = SCENERY:Register( Event.IniDCSUnitName, Event.initiator ) Event.IniCategory = Event.IniDCSUnit:getDesc().category - Event.IniTypeName = Event.IniDCSUnit:getTypeName() + Event.IniTypeName = Event.initiator:isExist() and Event.IniDCSUnit:getTypeName() or "SCENERY" -- TODO: Bug fix for 2.1! end end