Merge pull request #381 from peppy/general-fixes

General fixes.
ppy · Feb 22, 2017 · 202976c · 202976c
2 parents 0096b8c + 0d3cc39
commit 202976c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -107,7 +107,7 @@ protected override void Update()
 
             if (repeat > currentRepeat)
             {
-                if (ball.Tracking)
+                if (repeat < slider.RepeatCount && ball.Tracking)
                     PlaySample();
                 currentRepeat = repeat;
             }

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
@@ -196,7 +196,10 @@ private bool handleRequest(APIRequest req)
                 Logger.Log($@"Performing request {req}", LoggingTarget.Network);
                 req.Perform(this);
 
-                State = APIState.Online;
+                //we could still be in initialisation, at which point we don't want to say we're Online yet.
+                if (LocalUser.Value != null)
+                    State = APIState.Online;
+
                 failureCount = 0;
                 return true;
             }

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
@@ -240,21 +240,6 @@ public void Restart()
             });
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Content.Delay(250);
-            Content.FadeIn(250);
-
-            Delay(750);
-            Schedule(() =>
-            {
-                sourceClock.Start();
-                initializeSkipButton();
-            });
-        }
-
         private void onPass()
         {
             Delay(1000);
@@ -290,6 +275,22 @@ protected override void OnEntering(Screen last)
 
             Content.Alpha = 0;
             dimLevel.ValueChanged += dimChanged;
+
+            Content.Delay(250);
+            Content.FadeIn(250);
+
+            Delay(750);
+            Schedule(() =>
+            {
+                sourceClock.Start();
+                initializeSkipButton();
+            });
+        }
+
+        protected override void OnSuspending(Screen next)
+        {
+            Content.FadeOut(350);
+            base.OnSuspending(next);
         }
 
         protected override bool OnExiting(Screen next)