Merge pull request #350 from CBATeam/3den_xeh_fix

fix XEH preInit not executed after returning from 3den
CBATeam · Jun 2, 2016 · 8aad1d8 · 8aad1d8
2 parents 0fef1ae + b074514
commit 8aad1d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/addons/xeh/CfgEventHandlers.hpp b/addons/xeh/CfgEventHandlers.hpp
@@ -80,9 +80,8 @@ class Extended_Reloaded_EventHandlers {};
 
 // display xeh
 class Extended_DisplayLoad_EventHandlers {
-    // fix for preInit = 1 functions not being executed when entering 3den from main menu
     class Display3DEN {
-        ADDON = "[] call CBA_fnc_preInit;";
+        ADDON = QUOTE(call COMPILE_FILE(XEH_3DENDisplayLoad));
     };
 };
 class Extended_DisplayUnload_EventHandlers {};
diff --git a/addons/xeh/XEH_3DENDisplayLoad.sqf b/addons/xeh/XEH_3DENDisplayLoad.sqf
@@ -0,0 +1,7 @@
+#include "script_component.hpp"
+
+// fix for preInit = 1 functions not being executed when entering 3den from main menu
+[] call CBA_fnc_preInit;
+
+// since 1.60, preInit = 1 functions aren't executed when returning from a preview either ...
+add3DENEventHandler ["OnMissionPreviewEnd", {[] call CBA_fnc_preInit}];