More Bug Fixes

TDToolbox · Apr 30, 2020 · 299ed8c · 299ed8c
1 parent f865b5a
commit 299ed8c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Classes/Zip.cs b/Classes/Zip.cs
@@ -113,7 +113,7 @@ public void CopyFilesBetweenZips(ZipFile source, ZipFile dest, string filepath)
             string zipPath = filepath.Replace("\\", "/");
             filepath = filepath.Replace("/", "\\");
 
-            GetEntry(source, zipPath).Extract(Settings.settings.StagingDir);
+            GetEntry(source, zipPath).Extract(Settings.settings.StagingDir, ExtractExistingFileAction.OverwriteSilently);
 
             string[] split = filepath.Split('\\');
             string filename = split[split.Length - 1].Replace("\\","");

diff --git a/Mods_UserControl.xaml b/Mods_UserControl.xaml
@@ -62,7 +62,7 @@
             </Grid.ColumnDefinitions>
 
             <ListBox x:Name="SelectedMods_ListBox" Grid.Row="0" Grid.Column="0" ScrollViewer.VerticalScrollBarVisibility="Auto" 
-                     Background="{StaticResource BrushBackground}" Foreground="{StaticResource BrushFont}"/>
+                     Background="{StaticResource BrushBackground}" Foreground="{StaticResource BrushFont}" SelectionChanged="SelectedMods_ListBox_SelectionChanged_1"/>
             <Grid Grid.Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="20"/>

diff --git a/Mods_UserControl.xaml.cs b/Mods_UserControl.xaml.cs
@@ -141,7 +141,7 @@ private void AddMods_Button_Click(object sender, RoutedEventArgs e)
                         string filename = split[split.Length - 1];
                         string copiedMod = Mods.CopyMod(mod, modD + "\\" + filename);
 
-                        if (copiedMod != "")
+                        if (copiedMod != "" && copiedMod != " ")
                         {
                             FileInfo f = new FileInfo(copiedMod);
 
@@ -155,6 +155,9 @@ private void AddMods_Button_Click(object sender, RoutedEventArgs e)
                                 margin.Top = 10;
                                 item.Margin = margin;
                             }
+                            item.modName = f.Name;
+                            item.modPath = f.FullName;
+
                             Mods_ListBox.Items.Add(item);
                         }
                     }
@@ -309,5 +312,16 @@ private void LowestPriority_Click(object sender, RoutedEventArgs e)
 
             SelectedMods_ListBox.SelectedIndex = SelectedMods_ListBox.Items.Count-1;
         }
+
+        private void SelectedMods_ListBox_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
+        {
+            if(SelectedMods_ListBox.Items.Contains("") || SelectedMods_ListBox.Items.Contains(" "))
+            {
+                modPaths.Remove("");
+                modPaths.Remove(" ");
+                SelectedMods_ListBox.Items.Remove("");
+                SelectedMods_ListBox.Items.Remove(" ");
+            }
+        }
     }
 }