From 154b914a3a32d7ff2d21cf4ea9fd0eb563a3024c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2016 19:22:02 +0900
Subject: [PATCH] Fix API scheduling.

---
 osu.Game/Online/API/APIAccess.cs  | 11 ++++++++++-
 osu.Game/Online/API/APIRequest.cs |  9 ++++-----
 osu.Game/OsuGameBase.cs           |  6 ++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 1ecad1bb71..bb72bdf02e 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -5,12 +5,14 @@ using System;
 using System.Collections.Concurrent;
 using System.Net;
 using System.Threading;
+using osu.Framework;
 using osu.Framework.Logging;
+using osu.Framework.Threading;
 using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Online.API
 {
-    public class APIAccess
+    public class APIAccess : IUpdateable
     {
         private OAuth authentication;
 
@@ -20,6 +22,8 @@ namespace osu.Game.Online.API
 
         ConcurrentQueue<APIRequest> queue = new ConcurrentQueue<APIRequest>();
 
+        public Scheduler Scheduler = new Scheduler();
+
         public string Username;
 
         private SecurePassword password;
@@ -273,5 +277,10 @@ namespace osu.Game.Online.API
             authentication.Clear();
             State = APIState.Offline;
         }
+
+        public void Update()
+        {
+            Scheduler.Update();
+        }
     }
 }
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 3eada96417..a63530ab79 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -74,17 +74,16 @@ namespace osu.Game.Online.API
 
             WebRequest.BlockingPerform();
 
-            //OsuGame.Scheduler.Add(delegate {
-                Success?.Invoke();
-            //});
+            api.Scheduler.Add(delegate { Success?.Invoke(); });
         }
 
         public void Fail(Exception e)
         {
             WebRequest?.Abort();
-            //OsuGame.Scheduler.Add(delegate {
+            api.Scheduler.Add(delegate
+            {
                 Failure?.Invoke(e);
-            //});
+            });
         }
     }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8561c0124d..ec50314fdb 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -50,6 +50,12 @@ namespace osu.Game
             });
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            API.Update();
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             //refresh token may have changed.