From f5ef7b6b2d17ed6c32d9cbd34104dff6117acdd4 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 21 Feb 2016 00:36:46 +0100
Subject: [PATCH] displayLoad xeh for imenu

---
 addons/interact_menu/CfgEventHandlers.hpp | 10 ++++++++--
 addons/interact_menu/XEH_clientInit.sqf   | 11 -----------
 addons/interact_menu/XEH_displayLoad.sqf  |  9 +++++++++
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 addons/interact_menu/XEH_displayLoad.sqf

diff --git a/addons/interact_menu/CfgEventHandlers.hpp b/addons/interact_menu/CfgEventHandlers.hpp
index 1301f022d3..854f008c56 100644
--- a/addons/interact_menu/CfgEventHandlers.hpp
+++ b/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));
         };
     };
-};
\ No newline at end of file
+};
+
+class Extended_DisplayLoad_EventHandlers {
+    class RscDiary {
+        ADDON = QUOTE(call COMPILE_FILE(XEH_displayLoad));
+    };
+};
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index 017c2b05b8..4e4e6025a3 100644
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/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
diff --git a/addons/interact_menu/XEH_displayLoad.sqf b/addons/interact_menu/XEH_displayLoad.sqf
new file mode 100644
index 0000000000..ce58418c5d
--- /dev/null
+++ b/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)];
+};