Fix profile name generation and ini deserialization fixups

thesupersonic16 · May 23, 2021 · 9db33ba · 9db33ba
1 parent b2f3ae7
commit 9db33ba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/HedgeModManager/HedgeApp.xaml.cs b/HedgeModManager/HedgeApp.xaml.cs
@@ -487,7 +487,7 @@ public static void SelectSteamGame(SteamGame steamGame)
 
             ConfigPath = Path.Combine(StartDirectory, "cpkredir.ini");
             Config = new CPKREDIRConfig(ConfigPath);
-            ModsDbPath = Path.Combine(StartDirectory, Path.GetDirectoryName(Config.ModsDbIni));
+            ModsDbPath = Path.Combine(StartDirectory, Path.GetDirectoryName(Config.ModsDbIni) ?? "Mods");
         }
 
         public static void InstallGBHandlers()

diff --git a/HedgeModManager/Serialization/IniSerializer.cs b/HedgeModManager/Serialization/IniSerializer.cs
@@ -181,7 +181,11 @@ public static void Deserialize(object obj, IniFile file)
                 var valueType = property.PropertyType;
 
                 if (file.Groups.ContainsKey(group))
-                    property.SetValue(obj, ReadField(group, name, valueType));
+                {
+                    var value = ReadField(group, name, valueType);
+                    if (value != null)
+                        property.SetValue(obj, value);
+                }
             }
 
             foreach(var field in obj.GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.CreateInstance))
@@ -195,7 +199,11 @@ public static void Deserialize(object obj, IniFile file)
                 var valueType = field.FieldType;
 
                 if (file.Groups.ContainsKey(group))
-                    field.SetValue(obj, ReadField(group, name, valueType));
+                {
+                    var value = ReadField(group, name, valueType);
+                    if (value != null)
+                        field.SetValue(obj, value);
+                }
             }
 
             object ReadField(string group, string name, Type valueType)
@@ -221,6 +229,9 @@ object ReadField(string group, string name, Type valueType)
                 }
                 else if (valueType == typeof(string))
                 {
+                    if (!file.Groups.ContainsKey(group) || !file[group].Params.ContainsKey(name))
+                        return null;
+
                     return file[group][name];
                 }
                 else if (typeof(IEnumerable).IsAssignableFrom(valueType))

diff --git a/HedgeModManager/UI/ProfileManagerWindow.xaml.cs b/HedgeModManager/UI/ProfileManagerWindow.xaml.cs
@@ -75,7 +75,10 @@ private void UI_Add_Click(object sender, RoutedEventArgs e)
             {
                 // Add Profile
                 if (DataContext is MainWindowViewModel mainWindow)
+                {
+                    window.Profile.GeneratePath();
                     mainWindow.Profiles.Add(window.Profile);
+                }
             }
         }
 
@@ -107,6 +110,7 @@ private void UI_ProfileRename_Click(object sender, RoutedEventArgs e)
                 return;
             if (!(DataContext is MainWindowViewModel mainWindow))
                 return;
+
             new ProfileManagerRenameWindow(profile).ShowDialog();
         }