From d62f59faddcadd89f959c91f0857b3d42ec744ac Mon Sep 17 00:00:00 2001
From: UrbanCMC <UrbanCMC@web.de>
Date: Fri, 20 Oct 2023 20:26:41 +0200
Subject: [PATCH 1/3] Don't try to add cookies if array is empty

---
 Wabbajack.Common/HttpExtensions.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Wabbajack.Common/HttpExtensions.cs b/Wabbajack.Common/HttpExtensions.cs
index b2ca8d391..dee1b3d0a 100644
--- a/Wabbajack.Common/HttpExtensions.cs
+++ b/Wabbajack.Common/HttpExtensions.cs
@@ -18,7 +18,11 @@ public static class HttpExtensions
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36";
     public static HttpRequestMessage AddCookies(this HttpRequestMessage msg, Cookie[] cookies)
     {
-        msg.Headers.Add("Cookie", string.Join(";", cookies.Select(c => $"{c.Name}={c.Value}")));
+        if (cookies.Length > 0)
+        {
+            msg.Headers.Add("Cookie", string.Join(";", cookies.Select(c => $"{c.Name}={c.Value}")));
+        }
+
         return msg;
     }
 

From 058b1bb287e1cd44c63181c1f83befca3deda4a7 Mon Sep 17 00:00:00 2001
From: UrbanCMC <UrbanCMC@web.de>
Date: Fri, 20 Oct 2023 21:24:31 +0200
Subject: [PATCH 2/3] Start download from scratch if .download_package can't be
 parsed

---
 Wabbajack.Networking.Http/ResumableDownloader.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Wabbajack.Networking.Http/ResumableDownloader.cs b/Wabbajack.Networking.Http/ResumableDownloader.cs
index 025715e4c..078de77d4 100644
--- a/Wabbajack.Networking.Http/ResumableDownloader.cs
+++ b/Wabbajack.Networking.Http/ResumableDownloader.cs
@@ -166,8 +166,17 @@ private void DeletePackage()
             return null;
         }
 
-        var packageJson = _packagePath.ReadAllText();
-        return JsonSerializer.Deserialize<DownloadPackage>(packageJson);
+        try
+        {
+            var packageJson = _packagePath.ReadAllText();
+            return JsonSerializer.Deserialize<DownloadPackage>(packageJson);
+        }
+        catch (JsonException ex)
+        {
+            _logger.LogWarning(ex, "Package for '{name}' couldn't be parsed. Deleting package and starting from scratch...", _outputPath.FileName.ToString());
+            DeletePackage();
+            return null;
+        }
     }
 
     private void SavePackage(DownloadPackage package)

From 45c346316c7215d72859eef64440cf8b444589f5 Mon Sep 17 00:00:00 2001
From: UrbanCMC <UrbanCMC@web.de>
Date: Fri, 20 Oct 2023 21:25:50 +0200
Subject: [PATCH 3/3] Log when application is shutting down

---
 Wabbajack.App.Wpf/Views/MainWindow.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
index 8f7aba3c6..4641e7dd0 100644
--- a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
+++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
@@ -45,6 +45,7 @@ public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor system
 
                 Closed += (s, e) =>
                 {
+                    _logger.LogInformation("Beginning shutdown...");
                     _mwvm.CancelRunningTasks(TimeSpan.FromSeconds(10));
                     Application.Current.Shutdown();
                 };