mirror of
https://github.com/ppy/osu.git
synced 2025-02-16 11:42:56 +08:00
Pass ruleset to callback to prevent ruleset desync
This commit is contained in:
parent
bfcca38200
commit
5514a53df1
@ -174,16 +174,16 @@ namespace osu.Game.Overlays
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
|
userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
|
||||||
userReq.Success += userLoadComplete;
|
userReq.Success += u => userLoadComplete(u, ruleset);
|
||||||
API.Queue(userReq);
|
API.Queue(userReq);
|
||||||
loadingLayer.Show();
|
loadingLayer.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void userLoadComplete(APIUser loadedUser)
|
private void userLoadComplete(APIUser loadedUser, IRulesetInfo? userRuleset)
|
||||||
{
|
{
|
||||||
Debug.Assert(sections != null && sectionsContainer != null && tabs != null);
|
Debug.Assert(sections != null && sectionsContainer != null && tabs != null);
|
||||||
|
|
||||||
var actualRuleset = rulesets.GetRuleset(ruleset?.ShortName ?? loadedUser.PlayMode).AsNonNull();
|
var actualRuleset = rulesets.GetRuleset(userRuleset?.ShortName ?? loadedUser.PlayMode).AsNonNull();
|
||||||
|
|
||||||
var userProfile = new UserProfileData(loadedUser, actualRuleset);
|
var userProfile = new UserProfileData(loadedUser, actualRuleset);
|
||||||
Header.User.Value = userProfile;
|
Header.User.Value = userProfile;
|
||||||
|
Loading…
Reference in New Issue
Block a user