Merge pull request #668 from peppy/general-fixes

General fixes

.vscode/tasks.json

@@ -10,10 +10,16 @@
             "showOutput": "silent",
             "command": "msbuild",
             "args": [
-                // Ask msbuild to generate full paths for file names.
                 "/property:GenerateFullPaths=true",
                 "/property:DebugType=portable"
             ],
+            "windows": {
+                "args": [
+                    "/property:GenerateFullPaths=true",
+                    "/property:DebugType=portable",
+                    "/m" //parallel compiling support. doesn't work well with mono atm
+                ]
+            },
             // Use the standard MS compiler pattern to detect errors, warnings and infos
             "problemMatcher": "$msCompile",
             "isBuildCommand": true
@@ -29,6 +35,14 @@
                 "/property:DebugType=portable",
                 "/target:Clean,Build"
             ],
+            "windows": {
+                "args": [
+                    "/property:GenerateFullPaths=true",
+                    "/property:DebugType=portable",
+                    "/target:Clean,Build",
+                    "/m" //parallel compiling support. doesn't work well with mono atm
+                ]
+            },
             // Use the standard MS compiler pattern to detect errors, warnings and infos
             "problemMatcher": "$msCompile",
             "isBuildCommand": true

osu.Game/Overlays/MusicController.cs

@@ -294,7 +294,7 @@ namespace osu.Game.Overlays
                 trackManager.SetExclusive(current.Track);
                 current.Track.Start();
                 beatmapSource.Value = current;
-            }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted()), TaskContinuationOptions.OnlyOnFaulted);
+            }).ContinueWith(task => Schedule(task.ThrowIfFaulted), TaskContinuationOptions.OnlyOnFaulted);
             updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
         }
 

osu.Game/Screens/Play/PlayerInputManager.cs

@@ -38,8 +38,6 @@ namespace osu.Game.Screens.Play
 
         protected override void Update()
         {
-            base.Update();
-
             if (parentClock == null) return;
 
             clock.Rate = parentClock.Rate;