From 89dc9b6f89c9a4acfac58bc03bab8a90a107804a Mon Sep 17 00:00:00 2001
From: Chase <29675446+theace0296@users.noreply.github.com>
Date: Thu, 23 Sep 2021 17:21:47 -0400
Subject: [PATCH] Enclose private variable

---
 RandFramework/Client/init/fn_main.sqf | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/RandFramework/Client/init/fn_main.sqf b/RandFramework/Client/init/fn_main.sqf
index 5e2b1522..f0e2add7 100644
--- a/RandFramework/Client/init/fn_main.sqf
+++ b/RandFramework/Client/init/fn_main.sqf
@@ -99,13 +99,12 @@ waitUntil { TRGM_VAR_bAndSoItBegins && TRGM_VAR_CustomObjectsSet };
 
 [player] spawn TRGM_GLOBAL_fnc_setLoadout;
 
-private _isAceRespawnWithGear = false;
-if (call TRGM_GLOBAL_fnc_isCbaLoaded) then {
+if (call TRGM_GLOBAL_fnc_isCbaLoaded && call TRGM_GLOBAL_fnc_isAceLoaded) then {
     // check for ACE respawn with gear setting
-    _isAceRespawnWithGear = "ace_respawn_savePreDeathGear" call CBA_settings_fnc_get;
-};
-if (!_isAceRespawnWithGear) then {
-    player addEventHandler ["Respawn", { [player] spawn TRGM_GLOBAL_fnc_setLoadout; }];
+    private _isAceRespawnWithGear = "ace_respawn_savePreDeathGear" call CBA_settings_fnc_get;
+    if (!(isNil "_isAceRespawnWithGear") && {!_isAceRespawnWithGear}) then {
+        player addEventHandler ["Respawn", { [player] spawn TRGM_GLOBAL_fnc_setLoadout; }];
+    };
 };
 
 [] spawn {