From 0ffe21691a7471e6e8352f989bae33502a6ae973 Mon Sep 17 00:00:00 2001 From: Josuan Albin Date: Thu, 2 Nov 2017 15:50:06 +0100 Subject: [PATCH] Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic --- addons/arsenal/functions/fnc_onLoadoutsOpen.sqf | 2 +- .../arsenal/functions/fnc_onSelChangedLoadouts.sqf | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/arsenal/functions/fnc_onLoadoutsOpen.sqf b/addons/arsenal/functions/fnc_onLoadoutsOpen.sqf index c9098e956b..735c09e74b 100644 --- a/addons/arsenal/functions/fnc_onLoadoutsOpen.sqf +++ b/addons/arsenal/functions/fnc_onLoadoutsOpen.sqf @@ -24,7 +24,7 @@ if !(GVAR(allowDefaultLoadouts)) then { _buttonDefaultLoadoutsCtrl ctrlCommit 0; }; -if (!GVAR(allowSharedLoadouts) || {isMultiplayer}) then { +if !(GVAR(allowSharedLoadouts) || {isMultiplayer}) then { private _buttonShareLoadoutsCtrl = _display displayCtrl IDC_buttonSharedLoadouts; _buttonShareLoadoutsCtrl ctrlEnable false; _buttonShareLoadoutsCtrl ctrlCommit 0; diff --git a/addons/arsenal/functions/fnc_onSelChangedLoadouts.sqf b/addons/arsenal/functions/fnc_onSelChangedLoadouts.sqf index 70d9bebdfb..76b6a53d2d 100644 --- a/addons/arsenal/functions/fnc_onSelChangedLoadouts.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedLoadouts.sqf @@ -32,8 +32,10 @@ switch (GVAR(currentLoadoutsTab)) do { case IDC_buttonDefaultLoadouts: { - _loadButtonCtrl ctrlEnable true; - _loadButtonCtrl ctrlCommit 0; + { + _x ctrlEnable true; + _x ctrlCommit 0; + } foreach [_saveButtonCtrl, _loadButtonCtrl]; { _x ctrlEnable false; @@ -45,8 +47,10 @@ switch (GVAR(currentLoadoutsTab)) do { case IDC_buttonSharedLoadouts: { - _loadButtonCtrl ctrlEnable true; - _loadButtonCtrl ctrlCommit 0; + { + _x ctrlEnable true; + _x ctrlCommit 0; + } foreach [_saveButtonCtrl, _loadButtonCtrl]; { _x ctrlEnable false;