From d2155c3da3c01e54636a5ce4876618f68acb855f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 22:19:02 +0900
Subject: [PATCH] Fix thread safety

---
 osu.Game/Updater/UpdateManager.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 5da366bde9..61775a26b7 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -64,10 +64,12 @@ namespace osu.Game.Updater
             if (!CanCheckForUpdate)
                 return;
 
-            lock (updateTaskLock)
-                updateCheckTask ??= PerformUpdateCheck();
+            Task waitTask;
 
-            await updateCheckTask;
+            lock (updateTaskLock)
+                waitTask = (updateCheckTask ??= PerformUpdateCheck());
+
+            await waitTask;
 
             lock (updateTaskLock)
                 updateCheckTask = null;