Fixed simple downloader retrying.

server/RdtClient.Service/Services/DownloadClient.cs

@@ -63,7 +63,7 @@ namespace RdtClient.Service.Services
                 Downloader.DownloadComplete += (_, args) =>
                 {
                     Finished = true;
-                    Error = args.Error;
+                    Error ??= args.Error;
                 };
 
                 Downloader.DownloadProgress += (_, args) =>
@@ -81,6 +81,11 @@ namespace RdtClient.Service.Services
             }
             catch (Exception ex)
             {
+                if (Downloader != null)
+                {
+                    await Downloader.Cancel();
+                }
+
                 Error = $"An unexpected error occurred preparing download {_download.Link} for torrent {_torrent.RdName}: {ex.Message}";
                 Finished = true;
 

server/RdtClient.Service/Services/Downloaders/SimpleDownloader.cs

@@ -42,7 +42,7 @@ namespace RdtClient.Service.Services.Downloaders
                 await StartDownloadTask();
             });
             
-            return null;
+            return Task.FromResult<String>(null);
         }
 
         public Task Cancel()
@@ -137,6 +137,11 @@ namespace RdtClient.Service.Services.Downloaders
                     }
                 }
 
+                if (_cancelled)
+                {
+                    throw new Exception("Download cancelled");
+                }
+
                 if (timeout <= DateTimeOffset.UtcNow)
                 {
                     throw new Exception($"Download timed out");

server/RdtClient.Service/Services/TorrentRunner.cs

@@ -184,8 +184,8 @@ namespace RdtClient.Service.Services
                         {
                             Log($"Retrying download", download, download.Torrent);
 
-                            await _downloads.UpdateRetryCount(downloadId, download.RetryCount + 1);
                             await _downloads.Reset(downloadId);
+                            await _downloads.UpdateRetryCount(downloadId, download.RetryCount + 1);
                         }
                         else if (download.Torrent.RetryCount < TorrentRetryCount)
                         {