From 6c4ca387e01fcbbe82b1b29c49e0b0011f2cb1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Dec 2022 13:42:32 +0100
Subject: [PATCH] Fix wrong handling of missing ruleset statistics

---
 osu.Game/Online/Solo/SoloStatisticsWatcher.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Solo/SoloStatisticsWatcher.cs b/osu.Game/Online/Solo/SoloStatisticsWatcher.cs
index 268483ab91..383f6a202d 100644
--- a/osu.Game/Online/Solo/SoloStatisticsWatcher.cs
+++ b/osu.Game/Online/Solo/SoloStatisticsWatcher.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Online.Solo
         private readonly Dictionary<long, StatisticsUpdateCallback> callbacks = new Dictionary<long, StatisticsUpdateCallback>();
         private long? lastProcessedScoreId;
 
-        private readonly Dictionary<string, UserStatistics> latestStatistics = new Dictionary<string, UserStatistics>();
+        private Dictionary<string, UserStatistics>? latestStatistics;
 
         protected override void LoadComplete()
         {
@@ -69,7 +69,7 @@ namespace osu.Game.Online.Solo
         {
             callbacks.Clear();
             lastProcessedScoreId = null;
-            latestStatistics.Clear();
+            latestStatistics = null;
 
             if (localUser == null || localUser.OnlineID <= 1)
                 return;
@@ -77,7 +77,7 @@ namespace osu.Game.Online.Solo
             var userRequest = new GetUsersRequest(new[] { localUser.OnlineID });
             userRequest.Success += response => Schedule(() =>
             {
-                latestStatistics.Clear();
+                latestStatistics = new Dictionary<string, UserStatistics>();
                 foreach (var rulesetStats in response.Users.Single().RulesetsStatistics)
                     latestStatistics.Add(rulesetStats.Key, rulesetStats.Value);
             });
@@ -109,9 +109,12 @@ namespace osu.Game.Online.Solo
         {
             string rulesetName = callback.Score.Ruleset.ShortName;
 
-            if (!latestStatistics.TryGetValue(rulesetName, out var latestRulesetStatistics))
+            if (latestStatistics == null)
                 return;
 
+            latestStatistics.TryGetValue(rulesetName, out UserStatistics? latestRulesetStatistics);
+            latestRulesetStatistics ??= new UserStatistics();
+
             var update = new SoloStatisticsUpdate(callback.Score, latestRulesetStatistics, updatedStatistics);
             callback.OnUpdateReady.Invoke(update);