Merge pull request #268 from Givikap120/fix-score-id-loading

Fix populate from score doesn't finishing properly if failed

Author: stanriders

PerformanceCalculatorGUI/Screens/SimulateScreen.cs

@@ -1000,89 +1000,91 @@ private void populateSettingsFromScore(long scoreId)
 
             Task.Run(async () =>
             {
-                try
-                {
-                    var scoreInfo = await apiManager.GetJsonFromApi<SoloScoreInfo>($"scores/{scoreId}").ConfigureAwait(false);
+                var scoreInfo = await apiManager.GetJsonFromApi<SoloScoreInfo>($"scores/{scoreId}").ConfigureAwait(false);
 
-                    Schedule(() =>
+                Schedule(() =>
+                {
+                    if (scoreInfo.BeatmapID != working.BeatmapInfo.OnlineID)
                     {
-                        if (scoreInfo.BeatmapID != working.BeatmapInfo.OnlineID)
-                        {
-                            beatmapIdTextBox.Text = string.Empty;
-                            changeBeatmap(scoreInfo.BeatmapID.ToString());
-                        }
+                        beatmapIdTextBox.Text = string.Empty;
+                        changeBeatmap(scoreInfo.BeatmapID.ToString());
+                    }
 
-                        ruleset.Value = rulesets.GetRuleset(scoreInfo.RulesetID);
-                        appliedMods.Value = scoreInfo.Mods.Select(x => x.ToMod(ruleset.Value.CreateInstance())).ToList();
+                    ruleset.Value = rulesets.GetRuleset(scoreInfo.RulesetID);
+                    appliedMods.Value = scoreInfo.Mods.Select(x => x.ToMod(ruleset.Value.CreateInstance())).ToList();
 
-                        legacyTotalScore = scoreInfo.LegacyTotalScore;
+                    legacyTotalScore = scoreInfo.LegacyTotalScore;
 
-                        fullScoreDataSwitch.Current.Value = true;
+                    fullScoreDataSwitch.Current.Value = true;
 
-                        // TODO: this shouldn't be done in 2 lines
-                        comboTextBox.Value.Value = scoreInfo.MaxCombo;
-                        comboTextBox.Text = scoreInfo.MaxCombo.ToString();
+                    // TODO: this shouldn't be done in 2 lines
+                    comboTextBox.Value.Value = scoreInfo.MaxCombo;
+                    comboTextBox.Text = scoreInfo.MaxCombo.ToString();
 
-                        resetMisses();
-                        updateMissesTextboxes();
+                    resetMisses();
+                    updateMissesTextboxes();
 
-                        if (scoreInfo.Statistics.TryGetValue(HitResult.Miss, out int misses))
-                        {
-                            missesTextBox.Value.Value = misses;
-                            missesTextBox.Text = misses.ToString();
-                        }
+                    if (scoreInfo.Statistics.TryGetValue(HitResult.Miss, out int misses))
+                    {
+                        missesTextBox.Value.Value = misses;
+                        missesTextBox.Text = misses.ToString();
+                    }
 
-                        if (scoreInfo.Statistics.TryGetValue(HitResult.Ok, out int oks))
-                        {
-                            goodsTextBox.Value.Value = oks;
-                            goodsTextBox.Text = oks.ToString();
-                        }
+                    if (scoreInfo.Statistics.TryGetValue(HitResult.Ok, out int oks))
+                    {
+                        goodsTextBox.Value.Value = oks;
+                        goodsTextBox.Text = oks.ToString();
+                    }
 
-                        if (scoreInfo.Statistics.TryGetValue(HitResult.Meh, out int mehs))
-                        {
-                            mehsTextBox.Value.Value = mehs;
-                            mehsTextBox.Text = mehs.ToString();
-                        }
+                    if (scoreInfo.Statistics.TryGetValue(HitResult.Meh, out int mehs))
+                    {
+                        mehsTextBox.Value.Value = mehs;
+                        mehsTextBox.Text = mehs.ToString();
+                    }
 
-                        if (ruleset.Value?.ShortName == "fruits")
+                    if (ruleset.Value?.ShortName == "fruits")
+                    {
+                        if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickHit, out int largeTickHits))
                         {
-                            if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickHit, out int largeTickHits))
-                            {
-                                goodsTextBox.Value.Value = largeTickHits;
-                                goodsTextBox.Text = largeTickHits.ToString();
-                            }
-
-                            if (scoreInfo.Statistics.TryGetValue(HitResult.SmallTickHit, out int smallTickHits))
-                            {
-                                mehsTextBox.Value.Value = smallTickHits;
-                                mehsTextBox.Text = smallTickHits.ToString();
-                            }
+                            goodsTextBox.Value.Value = largeTickHits;
+                            goodsTextBox.Text = largeTickHits.ToString();
                         }
 
-                        if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickMiss, out int largeTickMisses))
+                        if (scoreInfo.Statistics.TryGetValue(HitResult.SmallTickHit, out int smallTickHits))
                         {
-                            largeTickMissesTextBox.Value.Value = largeTickMisses;
-                            largeTickMissesTextBox.Text = largeTickMisses.ToString();
+                            mehsTextBox.Value.Value = smallTickHits;
+                            mehsTextBox.Text = smallTickHits.ToString();
                         }
+                    }
 
-                        if (scoreInfo.Statistics.TryGetValue(HitResult.SliderTailHit, out int sliderTailHits))
-                        {
-                            int sliderTailMisses = scoreInfo.MaximumStatistics[HitResult.SliderTailHit] - sliderTailHits;
-                            sliderTailMissesTextBox.Value.Value = sliderTailMisses;
-                            sliderTailMissesTextBox.Text = sliderTailMisses.ToString();
-                        }
+                    if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickMiss, out int largeTickMisses))
+                    {
+                        largeTickMissesTextBox.Value.Value = largeTickMisses;
+                        largeTickMissesTextBox.Text = largeTickMisses.ToString();
+                    }
 
-                        calculateDifficulty();
-                        calculatePerformance();
+                    if (scoreInfo.Statistics.TryGetValue(HitResult.SliderTailHit, out int sliderTailHits))
+                    {
+                        int sliderTailMisses = scoreInfo.MaximumStatistics[HitResult.SliderTailHit] - sliderTailHits;
+                        sliderTailMissesTextBox.Value.Value = sliderTailMisses;
+                        sliderTailMissesTextBox.Text = sliderTailMisses.ToString();
+                    }
 
-                        scoreIdPopulateButton.State.Value = ButtonState.Done;
-                    });
-                }
-                catch (Exception e)
+                    calculateDifficulty();
+                    calculatePerformance();
+
+                    scoreIdPopulateButton.State.Value = ButtonState.Done;
+                });
+            }).ContinueWith(t =>
+            {
+                showError(t.Exception);
+            }, TaskContinuationOptions.OnlyOnFaulted).ContinueWith(t =>
+            {
+                Schedule(() =>
                 {
-                    Schedule(() => showError(e));
-                }
-            });
+                    scoreIdPopulateButton.State.Value = ButtonState.Done;
+                });
+            }, TaskContinuationOptions.None);
         }
 
         private void resetMisses()