Get volatile state at runtime

CBATeam · Oct 17, 2023 · 1230453 · 1230453
1 parent faabb51
commit 1230453
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/addons/settings/fnc_initDisplayMain.sqf b/addons/settings/fnc_initDisplayMain.sqf
@@ -28,12 +28,6 @@ if (_file != "") then {
 
 uiNamespace setVariable [QGVAR(userconfig), compileFinal str _userconfig];
 
-private _volatile = (getNumber (configFile >> QGVAR(volatile)) == 1) && {!hasInterface};
-uiNamespace setVariable [QGVAR(volatile), _volatile];
-if (_volatile) then {
-    WARNING("Server settings changes will be lost upon game restart.");
-};
-
 private _ctrlAddonOptions = _display displayCtrl IDC_MAIN_ADDONOPTIONS;
 
 if (isNil QUOTE(ADDON)) then {

diff --git a/addons/settings/initSettings.sqf b/addons/settings/initSettings.sqf
@@ -1,7 +1,7 @@
 // inline function, don't include script_component.hpp
 
 if (isNil QGVAR(default)) then {
-    private _volatile = uiNamespace getVariable QGVAR(volatile);
+    private _volatile = isServer && {!hasInterface} && {(getNumber (configFile >> QGVAR(volatile))) == 1};
 
     GVAR(allSettings) = [];
     GVAR(default) = [] call CBA_fnc_createNamespace;
@@ -13,6 +13,7 @@ if (isNil QGVAR(default)) then {
     if (isNil QGVAR(server)) then {
         GVAR(server) = NAMESPACE_NULL;
         GVAR(serverHashNamespace) = [profileNamespace, uiNamespace] select _volatile;
+        if (_volatile) then { WARNING("Server settings changes will be lost upon game restart."); };
     };
 
     if (isServer) then {