From 57e5f5575a13bef84fd6c7fa5ffe99bbaac4cd81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Jul 2021 14:23:24 +0900
Subject: [PATCH] Fix derived API request types firing success when they
 shouldn't

The usual case of `virtual`/`override` being dangerous when logic is
added to the base implementation. As such, I've removed this completely.
---
 osu.Game/Online/API/APIDownloadRequest.cs | 11 +++++------
 osu.Game/Online/API/APIRequest.cs         | 13 ++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 62e22d8f88..63bb3e2287 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Online.API
         /// </summary>
         protected virtual string FileExtension { get; } = @".tmp";
 
+        protected APIDownloadRequest()
+        {
+            base.Success += () => Success?.Invoke(filename);
+        }
+
         protected override WebRequest CreateWebRequest()
         {
             var file = Path.GetTempFileName();
@@ -39,12 +44,6 @@ namespace osu.Game.Online.API
             TriggerSuccess();
         }
 
-        internal override void TriggerSuccess()
-        {
-            base.TriggerSuccess();
-            Success?.Invoke(filename);
-        }
-
         public event APIProgressHandler Progressed;
 
         public new event APISuccessHandler<string> Success;
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 8d816d3975..e6bfca166e 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -25,6 +25,11 @@ namespace osu.Game.Online.API
         /// </summary>
         public new event APISuccessHandler<T> Success;
 
+        protected APIRequest()
+        {
+            base.Success += () => Success?.Invoke(Result);
+        }
+
         protected override void PostProcess()
         {
             base.PostProcess();
@@ -40,12 +45,6 @@ namespace osu.Game.Online.API
 
             TriggerSuccess();
         }
-
-        internal override void TriggerSuccess()
-        {
-            base.TriggerSuccess();
-            Success?.Invoke(Result);
-        }
     }
 
     /// <summary>
@@ -132,7 +131,7 @@ namespace osu.Game.Online.API
         {
         }
 
-        internal virtual void TriggerSuccess()
+        internal void TriggerSuccess()
         {
             lock (completionStateLock)
             {