From ec47b200399c3e4e0d63bdeb83e1431a6fc1890f Mon Sep 17 00:00:00 2001
From: fgsfds <4870330+fgsfds@users.noreply.github.com>
Date: Sat, 1 Jun 2024 22:25:46 +0500
Subject: [PATCH] bug fixes

---
 src/Avalonia/Core/Controls/MapsControl.axaml  | 1 +
 src/Mods/Providers/InstalledAddonsProvider.cs | 5 +++++
 src/Ports/Ports/BasePort.cs                   | 2 +-
 src/Ports/Ports/EDuke32/VoidSW.cs             | 4 ++--
 src/Ports/Ports/Raze.cs                       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia/Core/Controls/MapsControl.axaml b/src/Avalonia/Core/Controls/MapsControl.axaml
index 2ed64f22..51a27df4 100644
--- a/src/Avalonia/Core/Controls/MapsControl.axaml
+++ b/src/Avalonia/Core/Controls/MapsControl.axaml
@@ -38,6 +38,7 @@
         <ListBox Name="MapsList"
                  Grid.Row="1" Grid.Column="0"
                  ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                  Padding="2"
                  ItemsSource="{Binding MapsList}"
                  SelectedItem="{Binding SelectedAddon}"
diff --git a/src/Mods/Providers/InstalledAddonsProvider.cs b/src/Mods/Providers/InstalledAddonsProvider.cs
index 16f36053..6bd1384a 100644
--- a/src/Mods/Providers/InstalledAddonsProvider.cs
+++ b/src/Mods/Providers/InstalledAddonsProvider.cs
@@ -115,6 +115,11 @@ public void DeleteAddon(IAddon addon)
 
         File.Delete(addon.PathToFile);
 
+        if (addon is LooseMap lMap && lMap.BloodIni is not null)
+        {
+            File.Delete(lMap.BloodIni);
+        }
+
         _cache[addon.Type].Remove(new(addon.Id, addon.Version));
 
         AddonsChangedEvent?.Invoke(_game, addon.Type);
diff --git a/src/Ports/Ports/BasePort.cs b/src/Ports/Ports/BasePort.cs
index 49d7a56d..9153bb24 100644
--- a/src/Ports/Ports/BasePort.cs
+++ b/src/Ports/Ports/BasePort.cs
@@ -252,7 +252,7 @@ protected void GetBloodArgs(StringBuilder sb, BloodGame game, IAddon addon)
                 }
                 else
                 {
-                    sb.Append($@" -ini ""{lMap.BloodIni}""");
+                    sb.Append($@" -ini ""{Path.GetFileName(lMap.BloodIni)}""");
                 }
 
                 GetLooseMapArgs(sb, game, addon);
diff --git a/src/Ports/Ports/EDuke32/VoidSW.cs b/src/Ports/Ports/EDuke32/VoidSW.cs
index 8c3a034f..dda6a1e5 100644
--- a/src/Ports/Ports/EDuke32/VoidSW.cs
+++ b/src/Ports/Ports/EDuke32/VoidSW.cs
@@ -89,9 +89,9 @@ protected override void GetStartCampaignArgs(StringBuilder sb, IGame game, IAddo
 
 
 
-            if (game is WangGame wGame && addon is WangCampaign wMod)
+            if (game is WangGame wGame)
             {
-                GetWangArgs(sb, wGame, wMod);
+                GetWangArgs(sb, wGame, addon);
             }
             else
             {
diff --git a/src/Ports/Ports/Raze.cs b/src/Ports/Ports/Raze.cs
index 139d0257..2929973c 100644
--- a/src/Ports/Ports/Raze.cs
+++ b/src/Ports/Ports/Raze.cs
@@ -304,7 +304,7 @@ private void GetRedneckArgs(StringBuilder sb, RedneckGame game, IAddon addon)
                 return;
             }
 
-            if (addon is not DukeCampaign rCamp)
+            if (addon is not RedneckCampaign rCamp)
             {
                 ThrowHelper.ArgumentException(nameof(addon));
                 return;