Code cleanup

Artentus · Sep 26, 2018 · 46a2115 · 46a2115
1 parent 00b28d5
commit 46a2115
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/ModMyFactory/ModMyFactory/ViewModels/MainViewModel.cs b/ModMyFactory/ModMyFactory/ViewModels/MainViewModel.cs
@@ -836,18 +836,13 @@ private async Task AddModFromFolder()
         }
 
         #endregion
-
-        private bool ContainsModpack(string name)
-        {
-            return Modpacks.Any(item => item.Name == name);
-        }
-
+
         public void CreateNewModpack(ICollection<Mod> mods)
         {
             string name = App.Instance.GetLocalizedResourceString("NewModpackName");
             string newName = name;
             int counter = 0;
-            while (ContainsModpack(newName))
+            while (Modpacks.Contains(newName))
             {
                 counter++;
                 newName = $"{name} {counter}";

diff --git a/ModMyFactory/ModMyFactory/ViewModels/MainViewModel_ModpackImport.cs b/ModMyFactory/ModMyFactory/ViewModels/MainViewModel_ModpackImport.cs
@@ -149,7 +149,7 @@ private async Task AddMod(ModExportTemplate modTemplate, DirectoryInfo fileLocat
             {
                 if (ModFile.TryLoadFromFile(file, out var modFile, true))
                 {
-                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false, true);
+                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false);
                     modTemplate.Mod = mod;
                     return;
                 }
@@ -164,7 +164,7 @@ private async Task AddMod(ModExportTemplate modTemplate, DirectoryInfo fileLocat
             {
                 if (ModFile.TryLoadFromDirectory(directory, out var modFile, true))
                 {
-                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false, true);
+                    Mod mod = await Mod.Add(modFile, Mods, Modpacks, false);
                     modTemplate.Mod = mod;
                     return;
                 }