Merge pull request #3419 from peppy/fix-system-user

Fix system user attempting to show in profile overlay
ppy · Sep 14, 2018 · ccabad6 · ccabad6
2 parents bf10561 + a1328fb
commit ccabad6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/osu.Game/Online/Chat/InfoMessage.cs b/osu.Game/Online/Chat/InfoMessage.cs
@@ -15,11 +15,7 @@ public InfoMessage(string message) : base(infoID--)
             Timestamp = DateTimeOffset.Now;
             Content = message;
 
-            Sender = new User
-            {
-                Username = @"system",
-                Colour = @"0000ff",
-            };
+            Sender = User.SYSTEM_USER;
         }
     }
 }
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -77,9 +77,11 @@ protected override void PopOut()
 
         public void ShowUser(User user, bool fetchOnline = true)
         {
+            if (user == User.SYSTEM_USER) return;
+
             Show();
 
-            if (user.Id == Header?.User.Id)
+            if (user.Id == Header?.User?.Id)
                 return;
 
             userReq?.Cancel();

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
@@ -144,5 +144,14 @@ public class RankHistoryData
         public Badge[] Badges;
 
         public override string ToString() => Username;
+
+        /// <summary>
+        /// A user instance for displaying locally created system messages.
+        /// </summary>
+        public static readonly User SYSTEM_USER = new User
+        {
+            Username = "system",
+            Id = 0
+        };
     }
 }