GUI - Fix Volume Control Logic (#1364)

IDI-Systems · Dec 21, 2024 · 5cccfb3 · 5cccfb3
1 parent d07009d
commit 5cccfb3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/addons/sys_gui/fnc_volumeKeyDown.sqf b/addons/sys_gui/fnc_volumeKeyDown.sqf
@@ -20,8 +20,7 @@ if (!alive acre_player || ACRE_IS_SPECTATOR || GVAR(volumeOpen)) exitWith {false
 // Abort on open Dialogs that aren't an ACE Progressbar
 private _aceProgressBar = displayNull;
 if (
-    (dialog && !EGVAR(sys_core,aceLoaded)) || 
-    {_aceProgressBar = (uiNamespace getVariable ["ace_common_dlgProgress", displayNull]); _aceProgressBar isEqualTo displayNull}
+    dialog && {_aceProgressBar = (uiNamespace getVariable ["ace_common_dlgProgress", displayNull]); isNull _aceProgressBar}
 ) exitWith {false};
 
 // Add MouseScroll EH to open ACE Progressbar, for volume control

diff --git a/addons/sys_io/fnc_ts3ChannelMove.sqf b/addons/sys_io/fnc_ts3ChannelMove.sqf
@@ -18,6 +18,7 @@
 private _serverName = toString ((toArray serverName) select {_x < 127});
 if (_serverName == "") then {
     _serverName = "Unsupported Server Name";
+    if (!isMultiplayer) exitWith {};
     WARNING_1("Server name '%1' did not include any valid (ASCII) characters and got fully sanitized!",serverName)
 };
 private _ts3ChannelDetails = format ["%1,%2,%3", EGVAR(sys_core,ts3ChannelName), EGVAR(sys_core,ts3ChannelPassword), _serverName];