h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2101 from peppy/update-framework

Browse Source 
Update framework
This commit is contained in:
Dan Balasescu 2018-02-22 15:45:11 +09:00 committed by GitHub
commit 2910fc53dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit f6fa5b80ed06f84c8fd25a2576eea8d51565785c
Subproject commit 16a4bef775a49166f38faa6e952d83d8823fe3e0

4
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -22,6 +22,7 @@ namespace osu.Game.Overlays.Direct
public Track Preview { get; private set; }
private BeatmapSetInfo beatmapSet;
public BeatmapSetInfo BeatmapSet
{
get { return beatmapSet; }
@ -199,8 +200,7 @@ namespace osu.Game.Overlays.Direct
// add back the user's music volume setting (since we are no longer in the global TrackManager's hierarchy).
config.BindWith(FrameworkSetting.VolumeMusic, trackManager.Volume);
if (!string.IsNullOrEmpty(preview))
Preview = trackManager.Get(preview);
Preview = trackManager.Get(preview);
}
protected override void Dispose(bool isDisposing)