Skip to content

Commit

Permalink
Merge branch 'master' into release-3.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpas committed Feb 7, 2020
2 parents fb2b0b7 + 0464ca4 commit 215118a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions addons/settings/fnc_gui_settingOverwrite.sqf
Expand Up @@ -133,18 +133,18 @@ _controlsGroup setVariable [QFUNC(updateUI_locked), {
case ["mission", "server"]: {
_ctrlLocked ctrlSetText ICON_OVERWRITTEN;
_ctrlLocked ctrlSetTextColor _overwriteColor;
_ctrlLocked ctrlSetTooltip [LLSTRING(overwritten_by_server_tooltip), LLSTRING(overwritten_by_server_equal_tooltip)] select _overwriteEqual;
_ctrlLocked ctrlSetTooltip ([LLSTRING(overwritten_by_server_tooltip), LLSTRING(overwritten_by_server_equal_tooltip)] select _overwriteEqual);
};
case ["client", "mission"];
case ["server", "mission"]: {
_ctrlLocked ctrlSetText ICON_OVERWRITTEN;
_ctrlLocked ctrlSetTextColor _overwriteColor;
_ctrlLocked ctrlSetTooltip [LLSTRING(overwritten_by_mission_tooltip), LLSTRING(overwritten_by_mission_equal_tooltip)] select _overwriteEqual;
_ctrlLocked ctrlSetTooltip ([LLSTRING(overwritten_by_mission_tooltip), LLSTRING(overwritten_by_mission_equal_tooltip)] select _overwriteEqual);
};
case ["mission", "client"]: {
_ctrlLocked ctrlSetText ICON_OVERWRITTEN;
_ctrlLocked ctrlSetTextColor _overwriteColor;
_ctrlLocked ctrlSetTooltip [LLSTRING(overwritten_by_client_tooltip), LLSTRING(overwritten_by_client_equal_tooltip)] select _overwriteEqual;
_ctrlLocked ctrlSetTooltip ([LLSTRING(overwritten_by_client_tooltip), LLSTRING(overwritten_by_client_equal_tooltip)] select _overwriteEqual);
};
case ["server", "client"]: {
if (isServer) then {
Expand Down

0 comments on commit 215118a

Please sign in to comment.