Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Arsenal - Exit refresh early if no display is found #9754

Merged
merged 7 commits into from
Feb 5, 2024
Merged

Arsenal - Exit refresh early if no display is found #9754

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ddca5f
do nothing upon refreshing with no arsenal
LinkIsGrim Jan 22, 2024
186fdab
change another isNil check to isNull
LinkIsGrim Jan 22, 2024
344376c
actually change the check
LinkIsGrim Jan 22, 2024
1698d36
wait a frame before display notif on close
LinkIsGrim Jan 22, 2024
d542223
fix IDD
LinkIsGrim Jan 22, 2024
8c5198a
Merge remote-tracking branch 'upstream/master' into arsenal-prevent-u…
LinkIsGrim Feb 4, 2024
0dbdbd9
revert box checks to isNil
LinkIsGrim Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/arsenal/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ GVAR(lastSortDirectionRight) = DESCENDING;
params ["_object"];

// If the arsenal is already open, refresh arsenal display
if (!isNil QGVAR(currentBox) && {GVAR(currentBox) isEqualTo _object}) then {
if (!isNull GVAR(currentBox) && {GVAR(currentBox) isEqualTo _object}) then {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GVAR(currentBox) will only be nil during preInit

[true, true] call FUNC(refresh);
};
}] call CBA_fnc_addEventHandler;
Expand Down
7 changes: 5 additions & 2 deletions addons/arsenal/functions/fnc_refresh.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
13 changes: 9 additions & 4 deletions addons/arsenal/functions/fnc_removeBox.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,13 @@ 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;
if (!isNull GVAR(currentBox) && {GVAR(currentBox) isEqualTo _object} && {isNil QGVAR(ignoredVirtualItems)}) then {
johnb432 marked this conversation as resolved.
Show resolved Hide resolved
// 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;
};