1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:13:31 +08:00

Merge remote-tracking branch 'upstream/master' into fix-combo-colours

This commit is contained in:
Dean Herbert 2018-03-14 10:13:48 +09:00
commit d2a0ca6faa
2 changed files with 1 additions and 2 deletions

View File

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

View File

@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Toolbar
avatar.User = new User(); avatar.User = new User();
break; break;
case APIState.Online: case APIState.Online:
Text = api.Username; Text = api.LocalUser.Value.Username;
avatar.User = api.LocalUser; avatar.User = api.LocalUser;
break; break;
} }