From ad7cda87357d32be258e39104a5350ee9f6798a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 20:11:06 +0900
Subject: [PATCH] Fix download failures causing a non-safe drawable change

---
 osu.Game/Database/IModelDownloader.cs        | 2 ++
 osu.Game/Online/DownloadTrackingComposite.cs | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/IModelDownloader.cs b/osu.Game/Database/IModelDownloader.cs
index 17f1ccab06..99aeb4eacf 100644
--- a/osu.Game/Database/IModelDownloader.cs
+++ b/osu.Game/Database/IModelDownloader.cs
@@ -15,11 +15,13 @@ namespace osu.Game.Database
     {
         /// <summary>
         /// Fired when a <typeparamref name="TModel"/> download begins.
+        /// This is NOT run on the update thread and should be scheduled.
         /// </summary>
         event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
 
         /// <summary>
         /// Fired when a <typeparamref name="TModel"/> download is interrupted, either due to user cancellation or failure.
+        /// This is NOT run on the update thread and should be scheduled.
         /// </summary>
         event Action<ArchiveDownloadRequest<TModel>> DownloadFailed;
 
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 6e7ef99c6d..0769be2998 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -53,17 +53,17 @@ namespace osu.Game.Online
             manager.ItemRemoved += itemRemoved;
         }
 
-        private void downloadBegan(ArchiveDownloadRequest<TModel> request)
+        private void downloadBegan(ArchiveDownloadRequest<TModel> request) => Schedule(() =>
         {
             if (request.Model.Equals(Model.Value))
                 attachDownload(request);
-        }
+        });
 
-        private void downloadFailed(ArchiveDownloadRequest<TModel> request)
+        private void downloadFailed(ArchiveDownloadRequest<TModel> request) => Schedule(() =>
         {
             if (request.Model.Equals(Model.Value))
                 attachDownload(null);
-        }
+        });
 
         private ArchiveDownloadRequest<TModel> attachedRequest;