Merge pull request #811 from VladiStep/updaterRandomErrorFix

Random NullReferenceException of "UpdateApp()" fix (attempt).
UnderminersTeam · Mar 28, 2022 · 33b45bf · 33b45bf
2 parents b8b8a45 + 8a9578b
commit 33b45bf
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/UndertaleModTool/MainWindow.xaml.cs b/UndertaleModTool/MainWindow.xaml.cs
@@ -2390,6 +2390,7 @@ public async void UpdateApp(SettingsWindow window)
             using (WebClient webClient = new())
             {
                 bool end = false;
+                bool ended = false;
                 string downloaded = "0.00";
 
                 webClient.DownloadProgressChanged += new DownloadProgressChangedEventHandler((sender, e) =>
@@ -2402,7 +2403,14 @@ public async void UpdateApp(SettingsWindow window)
                     end = true;
 
                     HideProgressBar();
-                    scriptDialog = null;
+                    _ = Task.Run(() =>
+                    {
+                        // wait until progress bar updater loop is finished
+                        while (!ended)
+                            Thread.Sleep(100);
+
+                        scriptDialog = null;
+                    });
 
                     if (e.Error is not null)
                     {
@@ -2497,6 +2505,8 @@ public async void UpdateApp(SettingsWindow window)
 
                         Thread.Sleep(100);
                     }
+
+                    ended = true;
                 });
 
                 webClient.DownloadFileAsync(new Uri(downloadUrl), Path.GetTempPath() + "UndertaleModTool\\Update.zip");