From e9762b6919818318ba7ab472ee586d34dcf8c16e Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Fri, 24 Dec 2021 16:46:44 -0600
Subject: [PATCH] Fixed: Queue conflicts with the same download in multiple
 clients

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
---
 src/NzbDrone.Core/Queue/QueueService.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs
index 57efa912d..159168800 100644
--- a/src/NzbDrone.Core/Queue/QueueService.cs
+++ b/src/NzbDrone.Core/Queue/QueueService.cs
@@ -92,14 +92,7 @@ namespace NzbDrone.Core.Queue
                 DownloadForced = downloadForced
             };
 
-            if (album != null)
-            {
-                queue.Id = HashConverter.GetHashInt31(string.Format("trackedDownload-{0}-album{1}", trackedDownload.DownloadItem.DownloadId, album.Id));
-            }
-            else
-            {
-                queue.Id = HashConverter.GetHashInt31(string.Format("trackedDownload-{0}", trackedDownload.DownloadItem.DownloadId));
-            }
+            queue.Id = HashConverter.GetHashInt31($"trackedDownload-{trackedDownload.DownloadClient}-{trackedDownload.DownloadItem.DownloadId}-album{album?.Id ?? 0}");
 
             if (queue.Timeleft.HasValue)
             {