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

Merge branch 'master' into MakeMusicControllerDraggableAgain

Browse Source
This commit is contained in:
Dean Herbert 2018-01-25 09:01:54 +09:00 committed by GitHub
commit fd7d7c3953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Online/API/APIAccess.cs
View File

@ -126,6 +126,7 @@ namespace osu.Game.Online.API
userReq.Success += u =>
{
LocalUser.Value = u;
Username = LocalUser.Value.Username;
failureCount = 0;
//we're connected!

2
osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Toolbar
}
[BackgroundDependencyLoader(true)]
private void load(SettingsOverlay settings)
private void load(MainSettings settings)
{
StateContainer = settings;
}