Merge pull request #283 from CBATeam/fix3denpreview

don't execute preInit when returning to 3den
CBATeam · Feb 29, 2016 · 9303528 · 9303528
2 parents fcf3ce6 + 5ff0506
commit 9303528
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/addons/xeh/CfgEventHandlers.hpp b/addons/xeh/CfgEventHandlers.hpp
@@ -75,5 +75,9 @@ class Extended_WeaponAssembled_EventHandlers {};
 class Extended_WeaponDisassembled_EventHandlers {};
 
 // display xeh
-class Extended_DisplayLoad_EventHandlers {};
+class Extended_DisplayLoad_EventHandlers {
+    class RscDisplayInterrupt {
+        GVAR(3denFix) = QUOTE(call COMPILE_FILE(XEH_interruptDisplayLoad));
+    };
+};
 class Extended_DisplayUnload_EventHandlers {};
diff --git a/addons/xeh/XEH_interruptDisplayLoad.sqf b/addons/xeh/XEH_interruptDisplayLoad.sqf
@@ -0,0 +1,11 @@
+#include "script_component.hpp"
+
+disableSerialization;
+
+params ["_display"];
+
+private _ctrl = _display displayCtrl 104;
+
+if (ctrlText _ctrl == localize "STR_3DEN_RscDisplayInterrupt_ButtonAbort_3DEN_text") then {
+    _ctrl ctrlAddEventHandler ["buttonClick", {uiNamespace setVariable [QGVAR(3denFix), true]}];
+};
diff --git a/addons/xeh/fnc_preInit.sqf b/addons/xeh/fnc_preInit.sqf
@@ -16,6 +16,12 @@ Author:
 ---------------------------------------------------------------------------- */
 #include "script_component.hpp"
 
+// hack to fix 3den executing preInit unnecessarily when returning from a preview
+if (uiNamespace getVariable [QGVAR(3denFix), false]) exitWith {
+    uiNamespace setVariable [QGVAR(3denFix), false];
+    diag_log text "[XEH]: 3den preview detected. Abort preInit.";
+};
+
 SLX_XEH_DisableLogging = uiNamespace getVariable ["SLX_XEH_DisableLogging", false]; // get from preStart
 
 XEH_LOG("XEH: PreInit started. v" + getText (configFile >> "CfgPatches" >> "cba_common" >> "version") + ". " + PFORMAT_7("MISSIONINIT",missionName,worldName,isMultiplayer,isServer,isDedicated,hasInterface,didJIP));