From 6c60b6749410cf6fe4b399361c3445e76c0edc88 Mon Sep 17 00:00:00 2001
From: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Date: Mon, 5 Feb 2024 10:57:22 -0300
Subject: [PATCH] Arsenal - Exit refresh early if no display is found (#9754)

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
---
 addons/arsenal/XEH_postInit.sqf            |  3 ++-
 addons/arsenal/functions/fnc_refresh.sqf   |  7 +++++--
 addons/arsenal/functions/fnc_removeBox.sqf | 14 ++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/arsenal/XEH_postInit.sqf b/addons/arsenal/XEH_postInit.sqf
index ac6283e604..33646a25d7 100644
--- a/addons/arsenal/XEH_postInit.sqf
+++ b/addons/arsenal/XEH_postInit.sqf
@@ -22,7 +22,8 @@ GVAR(lastSortDirectionRight) = DESCENDING;
     params ["_object"];
 
     // If the arsenal is already open, refresh arsenal display
-    if (!isNil QGVAR(currentBox) && {GVAR(currentBox) isEqualTo _object}) then {
+    // Deliberate == check, fail on objNull
+    if (!isNil QGVAR(currentBox) && {GVAR(currentBox) == _object}) then {
         [true, true] call FUNC(refresh);
     };
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/arsenal/functions/fnc_refresh.sqf b/addons/arsenal/functions/fnc_refresh.sqf
index d40d59c0ff..849b49d16b 100644
--- a/addons/arsenal/functions/fnc_refresh.sqf
+++ b/addons/arsenal/functions/fnc_refresh.sqf
@@ -25,6 +25,11 @@ if (canSuspend) exitWith {
     [{_this call FUNC(refresh)}, _this] call CBA_fnc_directCall;
 };
 
+private _display = findDisplay IDD_ace_arsenal;
+
+// Exit quietly if no display found
+if (isNull _display) exitWith {};
+
 if (_updateItems) then {
     // Update current item list
     call FUNC(updateCurrentItemsList);
@@ -65,6 +70,4 @@ if (!_animate) then {
     [{GVAR(refreshing) = false}, nil, 3] call CBA_fnc_execAfterNFrames;
 };
 
-private _display = findDisplay IDD_ace_arsenal;
-
 [_display, _display displayCtrl GVAR(currentLeftPanel), _animate] call FUNC(fillLeftPanel);
diff --git a/addons/arsenal/functions/fnc_removeBox.sqf b/addons/arsenal/functions/fnc_removeBox.sqf
index 984db8d099..9fa3ec377a 100644
--- a/addons/arsenal/functions/fnc_removeBox.sqf
+++ b/addons/arsenal/functions/fnc_removeBox.sqf
@@ -42,8 +42,14 @@ if (_global && {isMultiplayer} && {!isNil "_id"}) then {
 };
 
 // If the arsenal is already open and not ignoring content (see FUNC(openBox)), close arsenal display
-if (!isNil QGVAR(currentBox) && {GVAR(currentBox) isEqualTo _object} && {isNil QGVAR(ignoredVirtualItems)}) then {
-    [LLSTRING(noVirtualItems), false, 5, 1] call EFUNC(common,displayText);
-    // Delay a frame in case this is running on display open
-    [{(findDisplay IDD_ace_arsenal) closeDisplay 0}] call CBA_fnc_execNextFrame;
+// Deliberate == check, fail on objNull
+if (!isNil QGVAR(currentBox) && {GVAR(currentBox) == _object} && {isNil QGVAR(ignoredVirtualItems)}) then {
+    // Delay a frame in case this is running on display open/close
+    [{
+        private _display = findDisplay IDD_ace_arsenal;
+        if (isNull _display) exitWith {};
+
+        [LLSTRING(noVirtualItems), false, 5, 1] call EFUNC(common,displayText);
+        _display closeDisplay 0;
+    }] call CBA_fnc_execNextFrame;
 };