Merge pull request #122 from gruppe-adler/zeus-disable-player-freqs

zeus: disable player freqs option in monitoring module
gruppe-adler · Mar 13, 2019 · 71cce50 · 71cce50
2 parents 3c88a24 + 3b13b01
commit 71cce50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/addons/zeus/functions/fnc_moduleDiagnosticsGetPlayerFreqs.sqf b/addons/zeus/functions/fnc_moduleDiagnosticsGetPlayerFreqs.sqf
@@ -10,9 +10,9 @@ if (!isNil "_activeSWRadio") then {
     private _altFreq = [_activeSWRadio,(_activeSWRadio call TFAR_fnc_getAdditionalSwChannel) + 1] call TFAR_fnc_getChannelFrequency;
 
     if (_altFreq == "") then {
-        _freqs pushBack format ["SR %1 Hz",_mainFreq];
+        _freqs pushBack format ["SR %1 MHz",_mainFreq];
     } else {
-        _freqs pushBack format ["SR %1 Hz / %2 Hz",_mainFreq,_altFreq];
+        _freqs pushBack format ["SR %1 MHz / %2 MHz",_mainFreq,_altFreq];
     };
 };
 
@@ -22,9 +22,9 @@ if (!isNil "_activeLRRadio") then {
     private _altFreq = [_activeLRRadio,(_activeLRRadio call TFAR_fnc_getAdditionalLrChannel) + 1] call TFAR_fnc_getChannelFrequency;
 
     if (_altFreq == "") then {
-        _freqs pushBack format ["LR %1 Hz",_mainFreq];
+        _freqs pushBack format ["LR %1 MHz",_mainFreq];
     } else {
-        _freqs pushBack format ["LR %1 Hz / %2 Hz",_mainFreq,_altFreq];
+        _freqs pushBack format ["LR %1 MHz / %2 MHz",_mainFreq,_altFreq];
     };
 };
 

diff --git a/addons/zeus/functions/fnc_ui_moduleDiagnostics.sqf b/addons/zeus/functions/fnc_ui_moduleDiagnostics.sqf
@@ -21,6 +21,9 @@ _control ctrlRemoveAllEventHandlers "setFocus";
 (_display displayCtrl 27005) cbSetChecked (GVAR(DiagnosticsSettings) select 4);
 (_display displayCtrl 27006) cbSetChecked (GVAR(DiagnosticsSettings) select 5);
 
+// DISABLE PLAYER FREQS UNTIL ISSUE IS FIXED (SEE GITHUB)
+(_display displayCtrl 27003) ctrlEnable false;
+
 private _fnc_onUnload = {
     private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objnull);
     if (isNull _logic) exitWith {};