Restore ACRE radio state even when not initialized

Author: Darojax

addons/main/functions/fnc_acreRestoreRadioStates.sqf

@@ -19,19 +19,28 @@
 
 params ["_unit", "_preRadios", "_states"];
 
-if (!([_unit] call FUNC(acreIsInitialized))) exitWith {};
-if !(_preRadios isEqualType []) exitWith {};
-if (!(_states isEqualType []) || {_states isEqualTo []}) exitWith {};
-
 private _debug = GETMVAR(GVAR(debugACRE),false);
 if (_debug) then {
-    diag_log text format ["[BOCR][ACRE] restore start unit=%1 pre=%2 states=%3", _unit, _preRadios, _states];
+    diag_log text format ["[BOCR][ACRE] restore called unit=%1 local=%2 pre=%3 states=%4", _unit, local _unit, _preRadios, _states];
 };
 
+if (!(missionNamespace getVariable [QGVAR(isACRELoaded), false])) exitWith {
+    if (_debug) then {diag_log text "[BOCR][ACRE] restore exit: ACRE not loaded";};
+};
+if (isNil "acre_api_fnc_getCurrentRadioList") exitWith {
+    if (_debug) then {diag_log text "[BOCR][ACRE] restore exit: ACRE API not present";};
+};
+if (!local _unit) exitWith {
+    if (_debug) then {diag_log text format ["[BOCR][ACRE] restore exit: unit not local (%1)", _unit];};
+};
+if !(_preRadios isEqualType []) exitWith {};
+if (!(_states isEqualType []) || {_states isEqualTo []}) exitWith {};
+
 // Wait a moment for ACRE to register the new radios (inventory changes are not always immediate).
 [
     {
         params ["_unit", "_preRadios", "_states"];
+        if (!([_unit] call FUNC(acreIsInitialized))) exitWith {false};
         private _postRadios = [_unit] call FUNC(acreGetUnitRadioIds);
         private _added = _postRadios - _preRadios;
         private _expected = count _states;
@@ -110,11 +119,16 @@ if (_debug) then {
         };
     },
     [_unit, _preRadios, _states],
-    2,
+    6,
     {
         // Timed out - best effort apply using whatever radios exist now.
         params ["_unit", "_preRadios", "_states"];
         private _debug = GETMVAR(GVAR(debugACRE),false);
+        if (!([_unit] call FUNC(acreIsInitialized))) exitWith {
+            if (_debug) then {
+                diag_log text format ["[BOCR][ACRE] restore timeout: ACRE not initialized unit=%1", _unit];
+            };
+        };
         private _postRadios = [_unit] call FUNC(acreGetUnitRadioIds);
         private _added = _postRadios - _preRadios;
         if (_debug) then {

addons/main/functions/fnc_actionOnBack.sqf

@@ -26,13 +26,13 @@ private _shouldSwitchNVGs = currentVisionMode _unit != 0;
 //make sure the player has a chestpack and no backpack
 if ((_chestpack isEqualTo "") or (backpack _unit isNotEqualTo "")) exitWith {};
 
-private _acreEnabled = [_unit] call FUNC(acreIsInitialized);
+private _acreLoaded = (missionNamespace getVariable [QGVAR(isACRELoaded), false]) && {!isNil "acre_api_fnc_getCurrentRadioList"};
 private _preRadios = [];
-if (_acreEnabled && {_chestpackAcreRadios isNotEqualTo []}) then {
+if (_acreLoaded && {_chestpackAcreRadios isNotEqualTo []}) then {
     _preRadios = [_unit] call FUNC(acreGetUnitRadioIds);
 };
 
-if (_acreEnabled) then {
+if (_acreLoaded) then {
     // Avoid setUnitLoadout when ACRE is running to prevent full radio re-init.
     _unit addBackpackGlobal _chestpack;
     private _backpack = backpackContainer _unit;
@@ -48,14 +48,14 @@ if (GVAR(isACEAXLoaded)) then {
     [_unit, [_unit] call aceax_gearinfo_fnc_getTextureOptions] call aceax_gearinfo_fnc_setTextureOptions;
 };
 
-if (!_acreEnabled && {_shouldSwitchNVGs}) then {
+if (!_acreLoaded && {_shouldSwitchNVGs}) then {
     _unit action ["NVGoggles", _unit];
 };
 //prefilled versions of backpacks (ammo bearer, engineer, explosives, medic, repair, etc)
 //can be emptied and placed in unit's backpack
 //they must each be emptied when added
 //safe since game inventory won't let players add non-empty backpacks into their backpack
-if (!_acreEnabled) then {
+if (!_acreLoaded) then {
     [QGVAR(clearCargoBackpacks), [backpackContainer _unit]] call CBA_fnc_globalEvent;
 };
 
@@ -66,7 +66,7 @@ private _backpack = backpackContainer _unit;
 } forEach _chestpackVariables;
 
 // Restore ACRE radio settings for radios that were inside the pack when it was moved to chest.
-if (_acreEnabled && {_chestpackAcreRadios isNotEqualTo []}) then {
+if (_acreLoaded && {_chestpackAcreRadios isNotEqualTo []}) then {
     [_unit, _preRadios, _chestpackAcreRadios] call FUNC(acreRestoreRadioStates);
 };
 

addons/main/functions/fnc_actionSwap.sqf

@@ -30,14 +30,14 @@ private _chestpackVariables = [_unit] call FUNC(chestpackVariables);
 private _chestpackAcreRadios = [_unit] call FUNC(chestpackAcreRadios);
 
 private _shouldSwitchNVGs = currentVisionMode _unit != 0;
-private _acreEnabled = [_unit] call FUNC(acreIsInitialized);
+private _acreLoaded = (missionNamespace getVariable [QGVAR(isACRELoaded), false]) && {!isNil "acre_api_fnc_getCurrentRadioList"};
 
 //make sure the player has chest-pack and backpack
 if ((_backpack isEqualTo "") or ([_unit] call FUNC(chestpack)) isEqualTo "") exitWith {};
 
 // If ACRE is running, capture per-radio state for radios inside the backpack that will become the new chestpack.
 // Also filter ACRE radio ID classnames out of the stored loadout to avoid re-adding IDed radios later.
-if (_acreEnabled) then {
+if (_acreLoaded) then {
     _backpackAcreRadios = [_unit, _backpackLoadoutRaw] call FUNC(acreCaptureRadioStatesFromLoadout);
     if !(isNil "acre_api_fnc_filterUnitLoadout") then {
         _unitLoadout = [_unitLoadout] call acre_api_fnc_filterUnitLoadout;
@@ -56,11 +56,11 @@ if (_acreEnabled) then {
 removeBackpackGlobal _unit;
 
 private _preRadios = [];
-if (_acreEnabled && {_chestpackAcreRadios isNotEqualTo []}) then {
+if (_acreLoaded && {_chestpackAcreRadios isNotEqualTo []}) then {
     _preRadios = [_unit] call FUNC(acreGetUnitRadioIds);
 };
 
-if (_acreEnabled) then {
+if (_acreLoaded) then {
     // Avoid setUnitLoadout when ACRE is running to prevent full radio re-init.
     _unit addBackpackGlobal _chestpack;
     private _backpackNew = backpackContainer _unit;
@@ -76,7 +76,7 @@ if (GVAR(isACEAXLoaded)) then {
     [_unit, [_unit] call aceax_gearinfo_fnc_getTextureOptions] call aceax_gearinfo_fnc_setTextureOptions;
 };
 
-if (!_acreEnabled && {_shouldSwitchNVGs}) then {
+if (!_acreLoaded && {_shouldSwitchNVGs}) then {
     _unit action ["NVGoggles", _unit];
 };
 
@@ -87,7 +87,7 @@ private _backpackNew = backpackContainer _unit;
 } forEach _chestpackVariables;
 
 // Restore ACRE radio settings for radios that were inside the chestpack.
-if (_acreEnabled && {_chestpackAcreRadios isNotEqualTo []}) then {
+if (_acreLoaded && {_chestpackAcreRadios isNotEqualTo []}) then {
     [_unit, _preRadios, _chestpackAcreRadios] call FUNC(acreRestoreRadioStates);
 };