sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables

Browse Source
This commit is contained in:
Andrei Zavatski
2019-10-01 13:54:15 +03:00
parent febe0175cd 2f877be0c4
commit 5b09daef1a
8 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/MusicController.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Overlays
/// <summary>
/// Returns whether the current beatmap track is playing.
/// </summary>
public bool IsPlaying => beatmap.Value.Track.IsRunning;
public bool IsPlaying => beatmap.Value?.Track.IsRunning ?? false;
private void handleBeatmapAdded(BeatmapSetInfo set) =>
Schedule(() => beatmapSets.Add(set));

25
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -44,16 +44,21 @@ namespace osu.Game.Overlays
Clear();
lastSection = null;
sections = new ProfileSection[]
{
//new AboutSection(),
new RecentSection(),
new RanksSection(),
//new MedalsSection(),
new HistoricalSection(),
new BeatmapsSection(),
new KudosuSection()
};
sections = !user.IsBot
? new ProfileSection[]
{
//new AboutSection(),
new RecentSection(),
new RanksSection(),
//new MedalsSection(),
new HistoricalSection(),
new BeatmapsSection(),
new KudosuSection()
}
: new ProfileSection[]
{
//new AboutSection(),
};
tabs = new ProfileTabControl
{