[oobe] fix scoobe page threading issues (microsoft#16532)

mshtang · Feb 28, 2022 · 6641aed · 6641aed
1 parent 630a7ef
commit 6641aed
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml.cs b/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml.cs
@@ -85,15 +85,26 @@ private async void Page_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
             TitleTxt.Text = loader.GetString("Oobe_WhatsNew");
             try
             {
-                ReleaseNotesMarkdown.Text = await GetReleaseNotesMarkdown();
-                ReleaseNotesMarkdown.Visibility = Windows.UI.Xaml.Visibility.Visible;
-                LoadingProgressRing.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
+                string releaseNotesMarkdown = await GetReleaseNotesMarkdown();
+
+                // Make sure we run in the UI thread. await doesn't seem to guarantee it.
+                await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+                {
+                    ReleaseNotesMarkdown.Text = releaseNotesMarkdown;
+                    ReleaseNotesMarkdown.Visibility = Windows.UI.Xaml.Visibility.Visible;
+                    LoadingProgressRing.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
+                });
             }
             catch (Exception ex)
             {
                 Logger.LogError("Exception when loading the release notes", ex);
-                LoadingProgressRing.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-                ErrorInfoBar.Visibility = Windows.UI.Xaml.Visibility.Visible;
+
+                // Make sure we run in the UI thread. await doesn't seem to guarantee it.
+                await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+                {
+                    LoadingProgressRing.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
+                    ErrorInfoBar.Visibility = Windows.UI.Xaml.Visibility.Visible;
+                });
             }
         }