1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-05 02:03:04 +08:00

Merge pull request #2481 from smoogipoo/revert-useroverlay-change

Revert breaking UserProfileOverlay change
This commit is contained in:
Dean Herbert 2018-05-02 16:19:37 +08:00 committed by GitHub
commit 036e62e2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -71,7 +71,6 @@ namespace osu.Game.Overlays
{ {
base.PopOut(); base.PopOut();
FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.Out); FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.Out);
cleanup();
} }
public void ShowUser(long userId) public void ShowUser(long userId)
@ -84,7 +83,9 @@ namespace osu.Game.Overlays
public void ShowUser(User user, bool fetchOnline = true) public void ShowUser(User user, bool fetchOnline = true)
{ {
cleanup(); userReq?.Cancel();
Clear();
lastSection = null;
sections = new ProfileSection[] sections = new ProfileSection[]
{ {
@ -164,13 +165,6 @@ namespace osu.Game.Overlays
sectionsContainer.ScrollToTop(); sectionsContainer.ScrollToTop();
} }
private void cleanup()
{
userReq?.Cancel();
Clear();
lastSection = null;
}
private void userLoadComplete(User user) private void userLoadComplete(User user)
{ {
Header.User = user; Header.User = user;