fully finished list clear and last packages bug fixing

R2NorthstarTools · Oct 21, 2023 · 4907ec0 · 4907ec0
1 parent ba7b87d
commit 4907ec0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/...72a2be2-ccd9-42f7-ae68-d9b57dd8b37c.vsidx → ...f14b547-b748-4cce-b223-9c3b647e6ac2.vsidx b/...72a2be2-ccd9-42f7-ae68-d9b57dd8b37c.vsidx → ...f14b547-b748-4cce-b223-9c3b647e6ac2.vsidx
diff --git a/...a69584e-8ee8-4ee5-819d-8703cc04a8d8.vsidx → ...67b511d-244b-464a-bc1d-8ef2bd357100.vsidx b/...a69584e-8ee8-4ee5-819d-8703cc04a8d8.vsidx → ...67b511d-244b-464a-bc1d-8ef2bd357100.vsidx
diff --git a/...d1286ab-899d-40d1-b8c3-3679edc4dec4.vsidx → ...7534c41-fb8a-4c68-a531-fa87fe773633.vsidx b/...d1286ab-899d-40d1-b8c3-3679edc4dec4.vsidx → ...7534c41-fb8a-4c68-a531-fa87fe773633.vsidx
diff --git a/...8e7c1ff-5d5d-470e-9358-463c7e23c78a.vsidx → ...7cb6d69-5c34-4aeb-a2c1-609ab211be76.vsidx b/...8e7c1ff-5d5d-470e-9358-463c7e23c78a.vsidx → ...7cb6d69-5c34-4aeb-a2c1-609ab211be76.vsidx
diff --git a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
@@ -354,7 +354,7 @@ public List<NORTHSTARCOMPATIBLE_MOD> READ_UPDATE_MOD_LIST(DirectoryInfo[] modsTo
 
 
 
-                                if (jsonObject.TryGetValue(Mod.Name.Replace("_", " ").Trim(), out JToken value))
+                                if (jsonObject.TryGetValue(Mod.Name.Trim(), out JToken value))
                                 {
 
 
@@ -446,12 +446,7 @@ public async Task Call_Mods_From_Folder()
                                 var dirs = rootDirs.EnumerateDirectories("*", new EnumerationOptions
                                 { RecurseSubdirectories = false }).ToArray();
 
-                                DispatchIfNecessary(async () =>
-
-                                {
-
-                                    Mod_Count_Label.Content = VTOL.Resources.Languages.Language.Page_Mods_Call_Mods_From_Folder_ModCount + subDirs.Length;
-                                });
+
                                 if (subDirs.Count() > 0)
                                 {
                                     int index = 0;
@@ -467,13 +462,19 @@ public async Task Call_Mods_From_Folder()
                                         CLEANED_FORMAT_MODS = DIRECTORY_MODS;
 
                                     }
+                                    DispatchIfNecessary(async () =>
+
+                                    {
 
+                                        Mod_Count_Label.Content = VTOL.Resources.Languages.Language.Page_Mods_Call_Mods_From_Folder_ModCount + CLEANED_FORMAT_MODS.Count;
+                                    });
                                     foreach (var Verified_Installed_Mod in CLEANED_FORMAT_MODS)
                                     {
                                         try
                                         {
                                             if (Verified_Installed_Mod.DIRECTORY_INFO != null)
                                             {
+
 
                                                 index++;
 
@@ -946,7 +947,7 @@ public void Move_Mods(string val, bool Enable_Disable)
                             string jsonContent = File.ReadAllText(Json_Path);
                             // Parse the JSON content
                             JObject jsonObject = JObject.Parse(jsonContent);
-                            string Name = val.Replace("_", " ");
+                            string Name = val;
                             if (jsonObject.TryGetValue(Name, out _))
                             {
                                 if (Enable_Disable != null)
@@ -2418,7 +2419,7 @@ protected virtual void Delete_Action(object sender, RoutedEventArgs e)
 
 
                         JObject jsonObject = JObject.Parse(jsonContent);
-                        string Name = workingmod.Replace("_", " ");
+                        string Name = workingmod;
                         if (jsonObject.TryGetValue(Name, out _))
                         {
                             jsonObject.Remove(Name);