Remove end sleep

* Remove the unnecessary sleep at the end of the update sequence * UI formatting
rex706 · Jun 30, 2023 · a89ce14 · a89ce14
1 parent a79cc5c
commit a89ce14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Updater/MainWindow.xaml b/Updater/MainWindow.xaml
@@ -14,7 +14,7 @@
             <Label x:Name="labelPerc" Content="" Margin="10,10,10,0" VerticalAlignment="Top" HorizontalContentAlignment="Center" Height="23" />
         </Grid>
         <Grid Margin="0,59,0,0">
-            <TextBox x:Name="ConsoleBox" IsReadOnly="True" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" Background="#FF191919" Foreground="#FFF1F1F1" Text="" Margin="10,10,10,10" TextChanged="ConsoleBox_TextChanged"/>
+            <TextBox x:Name="ConsoleBox" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" Background="#FF191919" Foreground="#FFF1F1F1" Text="" Margin="10,10,10,10" TextChanged="ConsoleBox_TextChanged" FontSize="11"/>
         </Grid>
     </Grid>
 </Window>
diff --git a/Updater/MainWindow.xaml.cs b/Updater/MainWindow.xaml.cs
@@ -167,7 +167,6 @@ private async void Update(string executable, List<Download> downloads)
             }
 
             Dispatcher.Invoke(() => { ConsoleBox.AppendText("Update complete!\n"); });
-            //MessageBox.Show("Update complete!");
 
             // First argument is the program to be opened when the update is complete.
             if (executable != null && executable.Length > 1 && executable.Contains(".exe"))
@@ -188,11 +187,10 @@ private async void Update(string executable, List<Download> downloads)
                 }
             }
 
-            Dispatcher.Invoke(() => { ConsoleBox.AppendText("Closing updater . . . \n"); });
-
-            Thread.Sleep(sleep);
-
-            Dispatcher.Invoke(() => { Close(); });
+            Dispatcher.Invoke(() => { 
+                ConsoleBox.AppendText("Closing updater . . . \n");
+                Close();
+            });
         }
 
         public async Task DownloadFile(string urlAddress, string fileName)
@@ -234,10 +232,7 @@ public async Task DownloadFile(string urlAddress, string fileName)
                     // Start the stopwatch which will be used to calculate the download speed.
                     sw.Start();
 
-                    Dispatcher.Invoke(() =>
-                    {
-                        ConsoleBox.AppendText("Downloading '" + fileName + "' . . .\n");
-                    });
+                    Dispatcher.Invoke(() => { ConsoleBox.AppendText("Downloading '" + fileName + "' . . .\n"); });
 
                     // Start downloading the file.
                     await webClient.DownloadFileTaskAsync(URL, path);