From eb2d822530227d303d2d10f661a2a544c3f1a3ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Jun 2022 14:28:48 +0900
Subject: [PATCH] Fix web requests potentially being performed after cancelled

Closes https://github.com/ppy/osu/issues/18524.
---
 osu.Game/Online/API/APIRequest.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 776ff5fd8f..451ea117d5 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -121,8 +121,16 @@ namespace osu.Game.Online.API
 
             if (isFailing) return;
 
-            Logger.Log($@"Performing request {this}", LoggingTarget.Network);
-            WebRequest.Perform();
+            try
+            {
+                Logger.Log($@"Performing request {this}", LoggingTarget.Network);
+                WebRequest.Perform();
+            }
+            catch (OperationCanceledException)
+            {
+                // ignore this. internally Perform is running async and the fail state may have changed since
+                // the last check of `isFailing` above.
+            }
 
             if (isFailing) return;