mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 10:33:01 +08:00
Merge remote-tracking branch 'upstream/master' into fix-combo-colours
This commit is contained in:
commit
d2a0ca6faa
@ -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!
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user