Prevent crash when a game does not have categories yet

Heufneutje · Sep 28, 2024 · a3aa2db · a3aa2db
1 parent 238b99e
commit a3aa2db
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/SpeedrunTracker/ViewModels/GameDetailViewModel.cs b/SpeedrunTracker/ViewModels/GameDetailViewModel.cs
@@ -214,19 +214,27 @@ public async Task LoadLeaderboardAsync()
         LeaderboardEntries.Clear();
 
         List<string> variableValues = new();
-        foreach (VariableViewModel vm in Variables)
-            variableValues.Add($"var-{vm.VariableId}={vm.SelectedValue.Id}");
-        string variables = string.Join('&', variableValues);
+        string variables = string.Empty;
 
-        if (!string.IsNullOrEmpty(variables))
-            variables = $"&{variables}";
+        if (Variables != null)
+        {
+            foreach (VariableViewModel vm in Variables)
+                variableValues.Add($"var-{vm.VariableId}={vm.SelectedValue.Id}");
+            variables = string.Join('&', variableValues);
+        }
 
-        _leaderboard = string.IsNullOrEmpty(SelectedLevel.Id) ?
-            await ExecuteNetworkTask(_leaderboardService.GetFullGameLeaderboardAsync(Game.Id, SelectedCategory.Id, variables, _settingsService.UserSettings.MaxLeaderboardResults)) :
-            await ExecuteNetworkTask(_leaderboardService.GetLevelLeaderboardAsync(Game.Id, SelectedLevel.Id, SelectedCategory.Id, variables, _settingsService.UserSettings.MaxLeaderboardResults));
+        if (SelectedCategory != null)
+        {
+            if (!string.IsNullOrEmpty(variables))
+                variables = $"&{variables}";
 
-        if (_leaderboard != null)
-            DisplayLeaderboardEntries();
+            _leaderboard = string.IsNullOrEmpty(SelectedLevel.Id) ?
+                await ExecuteNetworkTask(_leaderboardService.GetFullGameLeaderboardAsync(Game.Id, SelectedCategory.Id, variables, _settingsService.UserSettings.MaxLeaderboardResults)) :
+                await ExecuteNetworkTask(_leaderboardService.GetLevelLeaderboardAsync(Game.Id, SelectedLevel.Id, SelectedCategory.Id, variables, _settingsService.UserSettings.MaxLeaderboardResults));
+
+            if (_leaderboard != null)
+                DisplayLeaderboardEntries();
+        }
 
         IsLoadingLeaderboard = false;
     }