Merge pull request #860 from dremin/settings-enum-defined

Better validate that an enum value is defined
dremin · Jun 25, 2024 · 58c9d99 · 58c9d99
2 parents 8605def + 7af8cce
commit 58c9d99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
@@ -59,24 +59,20 @@ protected void Set<T>(ref T field, T value, [CallerMemberName] string propertyNa
         {
             if (!field.Equals(value))
             {
-                // TODO: Should we log setting change?
-
                 field = value;
                 OnPropertyChanged(propertyName);
             }
         }
 
-        protected void SetEnum<T>(ref T field, T value, [CallerMemberName] string propertyName = "") where T : struct, Enum
+        protected void SetEnum<T>(ref T field, T value, [CallerMemberName] string propertyName = "") where T : Enum
         {
             if (!field.Equals(value))
             {
-                if (Convert.ToInt32(value) < 0)
+                if (!Enum.IsDefined(typeof(T), value))
                 {
                     return;
                 }
 
-                // TODO: Should we log setting change?
-
                 field = value;
                 OnPropertyChanged(propertyName);
             }

diff --git a/RetroBar/Utilities/SettingsManager.cs b/RetroBar/Utilities/SettingsManager.cs
@@ -12,6 +12,13 @@ public class SettingsManager<T> : INotifyPropertyChanged where T : IMigratableSe
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
+        private static JsonSerializerOptions options = new()
+        {
+            IgnoreReadOnlyProperties = true,
+            WriteIndented = true,
+            DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
+        };
+
         private string _fileName;
 
         private T _settings;
@@ -66,13 +73,6 @@ private bool LoadFromFile()
 
         private void SaveToFile()
         {
-            JsonSerializerOptions options = new()
-            {
-                IgnoreReadOnlyProperties = true,
-                WriteIndented = true,
-                DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
-            };
-
             try
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(_fileName));