Merge pull request #382 from CBATeam/fix_display_configure

use a displayLoad eh for DisplayConfigure instead of overloading the onLoad config entry
CBATeam · Jun 18, 2016 · 038f9ca · 038f9ca
2 parents f7f5010 + 77d535f
commit 038f9ca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/addons/keybinding/CfgEventHandlers.hpp b/addons/keybinding/CfgEventHandlers.hpp
@@ -1,8 +1,12 @@
-class Extended_PreInit_EventHandlers
-{
-    class ADDON
-    {
-        clientInit = QUOTE(call COMPILE_FILE(XEH_preClientInit));
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
     };
 };
 
+class Extended_DisplayLoad_EventHandlers {
+    class RscDisplayConfigure {
+        ADDON = QUOTE(_this call COMPILE_FILE(XEH_configureDisplayLoad));
+    };
+};
diff --git a/addons/keybinding/gui/initDisplay.sqf → ...s/keybinding/XEH_configureDisplayLoad.sqf b/addons/keybinding/gui/initDisplay.sqf → ...s/keybinding/XEH_configureDisplayLoad.sqf
diff --git a/addons/keybinding/XEH_preClientInit.sqf → addons/keybinding/XEH_preInit.sqf b/addons/keybinding/XEH_preClientInit.sqf → addons/keybinding/XEH_preInit.sqf
@@ -1,6 +1,8 @@
 #include "script_component.hpp"
 SCRIPT(XEH_preInit);
 
+if (!hasInterface) exitWith {};
+
 ADDON = false;
 
 // Load DIK to string conversion table.

diff --git a/addons/keybinding/gui/gui.hpp b/addons/keybinding/gui/gui.hpp
@@ -25,8 +25,6 @@ class RscListBoxKeys;
 ///////////////////////////////////////////////////////////////////////////////
 
 class RscDisplayConfigure {
-    onLoad = "[""onLoad"",_this,""RscDisplayConfigure"",'GUI'] call compile preprocessfilelinenumbers ""a3\ui_f\scripts\initDisplay.sqf""; _this call compile preprocessfilelinenumbers ""\x\cba\addons\keybinding\gui\initDisplay.sqf""";
-
     class controls {
         class CA_ButtonCancel: RscButtonMenuCancel {
             onButtonClick = "_this call cba_keybinding_fnc_onButtonClick_cancel";