diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6918afa620..5eaeaa9899 100644 --- a/.vscode/tasks.json +++ b/.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 diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 19e742facb..f960d9e0ae 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/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); } diff --git a/osu.Game/Screens/Play/PlayerInputManager.cs b/osu.Game/Screens/Play/PlayerInputManager.cs index 6604dbfc7e..3ac28898a6 100644 --- a/osu.Game/Screens/Play/PlayerInputManager.cs +++ b/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;