From 7b0f970e7db162bf356b33b2977f22c638be15db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Jul 2021 16:04:51 +0900
Subject: [PATCH] Fix ongoing operation being begun in an async context

---
 .../TestSceneMultiplayerReadyButton.cs        | 20 +++++++-----
 .../TestSceneMultiplayerSpectateButton.cs     | 32 ++++++++++++-------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index fd9aa922b0..0e036e8868 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -66,19 +66,23 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(200, 50),
-                OnReadyClick = () => Task.Run(async () =>
+                OnReadyClick = () =>
                 {
                     readyClickOperation = OngoingOperationTracker.BeginOperation();
 
-                    if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                    Task.Run(async () =>
                     {
-                        await Client.StartMatch();
-                        return;
-                    }
+                        if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                        {
+                            await Client.StartMatch();
+                            return;
+                        }
 
-                    await Client.ToggleReady();
-                    readyClickOperation.Dispose();
-                })
+                        await Client.ToggleReady();
+
+                        readyClickOperation.Dispose();
+                    });
+                }
             });
         });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index a4b0195b00..4966dfbe50 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -70,31 +70,39 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Size = new Vector2(200, 50),
-                        OnSpectateClick = () => Task.Run(async () =>
+                        OnSpectateClick = () =>
                         {
                             readyClickOperation = OngoingOperationTracker.BeginOperation();
-                            await Client.ToggleSpectate();
-                            readyClickOperation.Dispose();
-                        })
+
+                            Task.Run(async () =>
+                            {
+                                await Client.ToggleSpectate();
+                                readyClickOperation.Dispose();
+                            });
+                        }
                     },
                     readyButton = new MultiplayerReadyButton
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Size = new Vector2(200, 50),
-                        OnReadyClick = () => Task.Run(async () =>
+                        OnReadyClick = () =>
                         {
                             readyClickOperation = OngoingOperationTracker.BeginOperation();
 
-                            if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                            Task.Run(async () =>
                             {
-                                await Client.StartMatch();
-                                return;
-                            }
+                                if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                                {
+                                    await Client.StartMatch();
+                                    return;
+                                }
 
-                            await Client.ToggleReady();
-                            readyClickOperation.Dispose();
-                        })
+                                await Client.ToggleReady();
+
+                                readyClickOperation.Dispose();
+                            });
+                        }
                     }
                 }
             };