From cbccd898ea312b5fe2f748097b648fdb21d86349 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Wed, 2 Sep 2015 23:58:24 -0500
Subject: [PATCH 1/3] Run functions after setting init

---
 addons/common/XEH_postInit.sqf | 10 +++++++++-
 addons/common/XEH_preInit.sqf  |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index ba014ff182..9fbe84362a 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -150,6 +150,14 @@ call FUNC(checkFiles);
     //Event that settings are safe to use:
     ["SettingsInitialized", []] call FUNC(localEvent);
 
+    //Set init finished and run all delayed functions:
+    GVAR(settingsInitFinished) = true;
+    diag_log text format ["%1 delayed functions", (count GVAR(runAtSettingsInitialized))];
+    {
+        _x params ["_args", "_code"];
+        _args call _code;
+    } forEach GVAR(runAtSettingsInitialized);
+    
 }, 0, [false]] call CBA_fnc_addPerFrameHandler;
 
 
@@ -326,7 +334,7 @@ GVAR(OldIsCamera) = false;
 if (didJip) then {
     // We are jipping! Get ready and wait, and throw the event
     [{
-        if(!(isNull player)) then {
+        if((!(isNull player)) && GVAR(settingsInitFinished)) then {
             ["PlayerJip", [player] ] call FUNC(localEvent);
             [(_this select 1)] call cba_fnc_removePerFrameHandler;
         };
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 6fdf99113c..12fdc5629d 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -303,6 +303,9 @@ GVAR(nextFrameNo) = diag_frameno;
 GVAR(nextFrameBufferA) = [];
 GVAR(nextFrameBufferB) = [];
 
+GVAR(settingsInitFinished) = false;
+GVAR(runAtSettingsInitialized) = [];
+
 // @TODO: Generic local-managed global-synced objects (createVehicleLocal)
 
 //Debug

From 789de9d111e7ca1deb5b548364cc879bc9776524 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Thu, 3 Sep 2015 00:11:49 -0500
Subject: [PATCH 2/3] runAfterSettingsInit helper func

---
 addons/common/XEH_postInit.sqf                |  6 ++---
 addons/common/XEH_preInit.sqf                 |  1 +
 .../functions/fnc_runAfterSettingsInit.sqf    | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 addons/common/functions/fnc_runAfterSettingsInit.sqf

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 9fbe84362a..24a9e4ab6e 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -152,10 +152,10 @@ call FUNC(checkFiles);
 
     //Set init finished and run all delayed functions:
     GVAR(settingsInitFinished) = true;
-    diag_log text format ["%1 delayed functions", (count GVAR(runAtSettingsInitialized))];
+    diag_log text format ["[ACE] %1 delayed functions running", (count GVAR(runAtSettingsInitialized))];
     {
-        _x params ["_args", "_code"];
-        _args call _code;
+        _x params ["_func", "_params"];
+        _params call _func;
     } forEach GVAR(runAtSettingsInitialized);
     
 }, 0, [false]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 12fdc5629d..56e3062cd2 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -157,6 +157,7 @@ PREP(requestCallback);
 PREP(resetAllDefaults);
 PREP(restoreVariablesJIP);
 PREP(revertKeyCodeLocalized);
+PREP(runAfterSettingsInit);
 PREP(sanitizeString);
 PREP(sendRequest);
 PREP(serverLog);
diff --git a/addons/common/functions/fnc_runAfterSettingsInit.sqf b/addons/common/functions/fnc_runAfterSettingsInit.sqf
new file mode 100644
index 0000000000..cf3faa1d7e
--- /dev/null
+++ b/addons/common/functions/fnc_runAfterSettingsInit.sqf
@@ -0,0 +1,27 @@
+/*
+ * Author: PabstMirror
+ * Executes code after setting are initilized.
+ *
+ * Argument:
+ * 0: Code to execute <CODE>
+ * 1: Parameters to run the code with <ANY>
+ *
+ * Return value:
+ * None
+ *
+ * Example:
+ * [{if (GVAR(setting) then {x} else {y};}, []] call ace_common_fnc_runAfterSettingsInit
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_func", "_params"];
+
+if (GVAR(settingsInitFinished)) then {
+    //Setting Already Finished, Direct Run the code
+    _params call _func;
+} else {
+    //Waiting on settings, throw it on the delayed run array
+    GVAR(runAtSettingsInitialized) pushBack [_func, _params];
+};

From 024dc3effef60e91532ea832f7b35c16a17a9fe3 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Thu, 3 Sep 2015 00:16:48 -0500
Subject: [PATCH 3/3] Cleanup

---
 addons/common/XEH_postInit.sqf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 24a9e4ab6e..4a194e0fe9 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -157,6 +157,7 @@ call FUNC(checkFiles);
         _x params ["_func", "_params"];
         _params call _func;
     } forEach GVAR(runAtSettingsInitialized);
+    GVAR(runAtSettingsInitialized) = nil; //cleanup
     
 }, 0, [false]] call CBA_fnc_addPerFrameHandler;