sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix download manager potentially not handling cancel requests

Browse Source
This commit is contained in:
Salman Ahmed 2019-12-25 22:55:14 +03:00
parent 1455b9e796
commit 89fa1be2c8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Database/DownloadableArchiveModelManager.cs
View File

@ -92,8 +92,6 @@ namespace osu.Game.Database
notification.CancelRequested += () => notification.CancelRequested += () =>
{ {
request.Cancel(); request.Cancel();
currentDownloads.Remove(request);
notification.State = ProgressNotificationState.Cancelled;
return true; return true;
}; };
@ -109,11 +107,11 @@ namespace osu.Game.Database
{ {
DownloadFailed?.Invoke(request); DownloadFailed?.Invoke(request);
if (error is OperationCanceledException) return;
notification.State = ProgressNotificationState.Cancelled;
Logger.Error(error, $"{HumanisedModelName.Titleize()} download failed!");
currentDownloads.Remove(request); currentDownloads.Remove(request);
notification.State = ProgressNotificationState.Cancelled;
if (!(error is OperationCanceledException))
Logger.Error(error, $"{HumanisedModelName.Titleize()} download failed!");
} }
} }