sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects 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
parent ac99ca6881 c070c69522
commit 2910fc53dc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: f6fa5b80ed...16a4bef775

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)