Fixed an issue affecting parsing the required runstate to edit a setting.
This commit is contained in:
+1
-1
@@ -64,7 +64,7 @@ public class SettingsEntryRegistrar : ISettingsRegistrationProvider
|
|||||||
Func<OneOf<string, XElement, object>, bool> valueChangePredicate)
|
Func<OneOf<string, XElement, object>, bool> valueChangePredicate)
|
||||||
{
|
{
|
||||||
return !info.Element.GetAttributeBool("ReadOnly", false)
|
return !info.Element.GetAttributeBool("ReadOnly", false)
|
||||||
|| !info.EditableStates.HasFlag(_infoProvider?.CurrentRunState ?? RunState.Running)
|
|| info.EditableStates < _infoProvider.CurrentRunState
|
||||||
|| valueChangePredicate is null
|
|| valueChangePredicate is null
|
||||||
|| valueChangePredicate.Invoke(newValue);
|
|| valueChangePredicate.Invoke(newValue);
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -92,9 +92,9 @@ public sealed class SettingsFileParserService :
|
|||||||
OwnerPackage = res.path.ContentPackage,
|
OwnerPackage = res.path.ContentPackage,
|
||||||
DataType = element.GetAttributeString("Type", string.Empty),
|
DataType = element.GetAttributeString("Type", string.Empty),
|
||||||
Element = element,
|
Element = element,
|
||||||
EditableStates = element.GetAttributeBool("AllowChangesWhileExecuting", true) ? RunState.Running :
|
EditableStates = element.GetAttributeBool("ReadOnly", false) ? RunState.Unloaded :
|
||||||
element.GetAttributeBool("ReadOnly", false) ? RunState.LoadedNoExec :
|
element.GetAttributeBool("AllowChangesWhileExecuting", true) ? RunState.Running :
|
||||||
RunState.Unloaded,
|
RunState.LoadedNoExec,
|
||||||
NetSync = element.GetAttributeEnum("NetSync", NetSync.None),
|
NetSync = element.GetAttributeEnum("NetSync", NetSync.None),
|
||||||
#if CLIENT
|
#if CLIENT
|
||||||
DisplayName = $"{packageIdent}.{name}.DisplayName",
|
DisplayName = $"{packageIdent}.{name}.DisplayName",
|
||||||
|
|||||||
Reference in New Issue
Block a user