displayLoad xeh for imenu

addons/interact_menu/CfgEventHandlers.hpp

@@ -6,7 +6,7 @@ class Extended_PreInit_EventHandlers {
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        clientInit = QUOTE( call COMPILE_FILE(XEH_clientInit) );
+        clientInit = QUOTE(call COMPILE_FILE(XEH_clientInit));
     };
 };
 
@@ -16,4 +16,10 @@ class Extended_InitPost_EventHandlers {
             init = QUOTE(_this call FUNC(compileMenu);_this call FUNC(compileMenuSelfAction));
         };
     };
-};
+};
+
+class Extended_DisplayLoad_EventHandlers {
+    class RscDiary {
+        ADDON = QUOTE(call COMPILE_FILE(XEH_displayLoad));
+    };
+};

addons/interact_menu/XEH_clientInit.sqf

@@ -25,17 +25,6 @@ GVAR(ParsedTextCached) = [];
 //Add Actions to Houses:
 ["interactMenuOpened", {_this call FUNC(userActions_addHouseActions)}] call EFUNC(common,addEventHandler);
 
-// This spawn is probably worth keeping, as pfh don't work natively on the briefing screen and IDK how reliable the hack we implemented for them is.
-// The thread dies as soon as the mission start, so it's not really compiting for scheduler space.
-[] spawn {
-    // Wait until the map display is detected
-    waitUntil {(!isNull findDisplay 12)};
-
-    // Install the render EH on the map screen
-    ((findDisplay 12) displayCtrl 51) ctrlAddEventHandler ["Draw", DFUNC(render)];
-};
-
-
 ["ACE3 Common", QGVAR(InteractKey), (localize LSTRING(InteractKey)),
 {
     // Statement

addons/interact_menu/XEH_displayLoad.sqf

@@ -0,0 +1,9 @@
+#include "script_component.hpp"
+
+disableSerialization;
+
+params ["_display"];
+
+if (ctrlIDD _display == 12) then { // RscDisplayMainMap
+    (_display displayCtrl 51) ctrlAddEventHandler ["Draw", DFUNC(render)];
+};