From d7fa6933be18d192bbaf097dfb032606ec8f719c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2017 16:31:56 +0900
Subject: [PATCH 1/2] Fix potential nullref

---
 osu.Game/Users/UserPanel.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index c78a69dac8..bdfe6d1c8e 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -158,14 +158,19 @@ public UserPanel(User user)
                     },
                 },
             };
-
-            Status.ValueChanged += displayStatus;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             this.colours = colours;
+            Status.ValueChanged += displayStatus;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Status.TriggerChange();
         }
 
         private void displayStatus(UserStatus status)

From 1a255fdf4818358f2478e674601a7fe6399ddce6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 May 2017 19:47:18 +0900
Subject: [PATCH 2/2] Fix display order regression

---
 .../Sections/General/LoginSettings.cs         | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 2c92e8653e..d8db44607a 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -28,6 +28,9 @@ public class LoginSettings : FillFlowContainer, IOnlineComponent
         private LoginForm form;
         private OsuColour colours;
 
+        private UserPanel panel;
+        private UserDropdown dropdown;
+
         public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
 
         public bool Bounding
@@ -95,33 +98,6 @@ public void APIStateChanged(APIAccess api, APIState state)
                     };
                     break;
                 case APIState.Online:
-                    UserDropdown dropdown = new UserDropdown { RelativeSizeAxes = Axes.X };
-                    dropdown.Current.ValueChanged += newValue =>
-                    {
-                        switch (newValue)
-                        {
-                            case UserAction.Online:
-                                api.LocalUser.Value.Status.Value = new UserStatusOnline();
-                                dropdown.StatusColour = colours.Green;
-                                break;
-                            case UserAction.DoNotDisturb:
-                                api.LocalUser.Value.Status.Value = new UserStatusDoNotDisturb();
-                                dropdown.StatusColour = colours.Red;
-                                break;
-                            case UserAction.AppearOffline:
-                                api.LocalUser.Value.Status.Value = new UserStatusOffline();
-                                dropdown.StatusColour = colours.Gray7;
-                                break;
-                            case UserAction.SignOut:
-                                api.Logout();
-                                break;
-                        }
-                    };
-                    dropdown.Current.TriggerChange();
-
-                    UserPanel panel = new UserPanel(api.LocalUser.Value) { RelativeSizeAxes = Axes.X };
-                    panel.Status.BindTo(api.LocalUser.Value.Status);
-
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
@@ -150,11 +126,36 @@ public void APIStateChanged(APIAccess api, APIState state)
                                         },
                                     },
                                 },
-                                panel,
-                                dropdown,
+                                panel = new UserPanel(api.LocalUser.Value) { RelativeSizeAxes = Axes.X },
+                                dropdown = new UserDropdown { RelativeSizeAxes = Axes.X },
                             },
                         },
                     };
+
+                    panel.Status.BindTo(api.LocalUser.Value.Status);
+
+                    dropdown.Current.TriggerChange();
+                    dropdown.Current.ValueChanged += newValue =>
+                    {
+                        switch (newValue)
+                        {
+                            case UserAction.Online:
+                                api.LocalUser.Value.Status.Value = new UserStatusOnline();
+                                dropdown.StatusColour = colours.Green;
+                                break;
+                            case UserAction.DoNotDisturb:
+                                api.LocalUser.Value.Status.Value = new UserStatusDoNotDisturb();
+                                dropdown.StatusColour = colours.Red;
+                                break;
+                            case UserAction.AppearOffline:
+                                api.LocalUser.Value.Status.Value = new UserStatusOffline();
+                                dropdown.StatusColour = colours.Gray7;
+                                break;
+                            case UserAction.SignOut:
+                                api.Logout();
+                                break;
+                        }
+                    };
                     break;
             }