Fixes: Missing default path for Download Station

(cherry picked from commit 4bf3ab1511b4ea25642476bf9df13f91b6f73d76) Closes #2062
Prowlarr · Mar 12, 2024 · 17ff86a · 17ff86a
1 parent 7f8c1ac
commit 17ff86a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
@@ -308,14 +308,15 @@ protected string GetDownloadDirectory()
             {
                 return Settings.TvDirectory.TrimStart('/');
             }
-            else if (Settings.Category.IsNotNullOrWhiteSpace())
-            {
-                var destDir = GetDefaultDir();
 
+            var destDir = GetDefaultDir();
+
+            if (destDir.IsNotNullOrWhiteSpace() && Settings.Category.IsNotNullOrWhiteSpace())
+            {
                 return $"{destDir.TrimEnd('/')}/{Settings.Category}";
             }
 
-            return null;
+            return destDir.TrimEnd('/');
         }
 
         protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)

diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
@@ -274,14 +274,15 @@ protected string GetDownloadDirectory()
             {
                 return Settings.TvDirectory.TrimStart('/');
             }
-            else if (Settings.Category.IsNotNullOrWhiteSpace())
-            {
-                var destDir = GetDefaultDir();
 
+            var destDir = GetDefaultDir();
+
+            if (destDir.IsNotNullOrWhiteSpace() && Settings.Category.IsNotNullOrWhiteSpace())
+            {
                 return $"{destDir.TrimEnd('/')}/{Settings.Category}";
             }
 
-            return null;
+            return destDir.TrimEnd('/');
         }
 
         protected override string AddFromLink(ReleaseInfo release)