From 86b29064c6ed6e476dc4b05f674e10cbf5554b0a Mon Sep 17 00:00:00 2001
From: Paul Teng <plankp@outlook.com>
Date: Thu, 18 Oct 2018 08:51:05 -0400
Subject: [PATCH] Change DownloadState only when Download is possible

---
 osu.Game/Beatmaps/BeatmapManager.cs                 | 8 +++++---
 osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index aa653d88f9..fad94dcdfd 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -148,11 +148,12 @@ protected override BeatmapSetInfo CheckForExisting(BeatmapSetInfo model)
         /// </summary>
         /// <param name="beatmapSetInfo">The <see cref="BeatmapSetInfo"/> to be downloaded.</param>
         /// <param name="noVideo">Whether the beatmap should be downloaded without video. Defaults to false.</param>
-        public void Download(BeatmapSetInfo beatmapSetInfo, bool noVideo = false)
+        /// <returns>Downloading can happen</returns>
+        public bool Download(BeatmapSetInfo beatmapSetInfo, bool noVideo = false)
         {
             var existing = GetExistingDownload(beatmapSetInfo);
 
-            if (existing != null || api == null) return;
+            if (existing != null || api == null) return false;
 
             if (!api.LocalUser.Value.IsSupporter)
             {
@@ -161,7 +162,7 @@ public void Download(BeatmapSetInfo beatmapSetInfo, bool noVideo = false)
                     Icon = FontAwesome.fa_superpowers,
                     Text = "You gotta be an osu!supporter to download for now 'yo"
                 });
-                return;
+                return false;
             }
 
             var downloadNotification = new DownloadNotification
@@ -227,6 +228,7 @@ public void Download(BeatmapSetInfo beatmapSetInfo, bool noVideo = false)
             // don't run in the main api queue as this is a long-running task.
             Task.Factory.StartNew(() => request.Perform(api), TaskCreationOptions.LongRunning);
             BeatmapDownloadBegan?.Invoke(request);
+            return true;
         }
 
         protected override void PresentCompletedImport(IEnumerable<BeatmapSetInfo> imported)
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
index 6f4d4c0d6f..de19c24d2f 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
@@ -71,9 +71,10 @@ public void Download()
             if (DownloadState.Value > DownloadStatus.NotDownloaded)
                 return;
 
-            beatmaps.Download(set, noVideo);
-
-            DownloadState.Value = DownloadStatus.Downloading;
+            if (beatmaps.Download(set, noVideo)) {
+                // Only change state if download can happen
+                DownloadState.Value = DownloadStatus.Downloading;
+            }
         }
 
         private void setAdded(BeatmapSetInfo s)