Moved OutputBox "write line" code

yoshiask · Aug 30, 2021 · f0955a7 · f0955a7
1 parent 0e62ade
commit f0955a7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Installer/Steps/S04_Installing.xaml.cs b/Installer/Steps/S04_Installing.xaml.cs
@@ -36,7 +36,7 @@ private async void Step_Loaded(object sender, RoutedEventArgs e)
             App.InstallerWindow.SetCancelButtonEnabled();
 
             // Extract ZIP to temp folder
-            OutputBox.Text += "Extracting installer...\r\n";
+            OutputBoxWriteLine("Extracting installer...");
             TempFolder = Directory.CreateDirectory(Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FluentStoreInstaller"));
             ZipFile = new(Path.Combine(TempFolder.FullName, "FluentStore_Beta.zip"));
@@ -82,7 +82,7 @@ private async void Step_Loaded(object sender, RoutedEventArgs e)
                 App.InstallerWindow.ShowErrorMessage("Failed to start install script.");
                 return;
             }
-            OutputBox.Text += "Beginning install...\r\n";
+            OutputBoxWriteLine("Beginning install...");
             psProc.BeginErrorReadLine();
             await psProc.StandardOutput.ReadLineAsync();
             await Task.Delay(100);
@@ -122,7 +122,7 @@ private async void Step_Loaded(object sender, RoutedEventArgs e)
                     continue;
 
                 Debug.WriteLine("\tOut> " + line);
-                OutputBox.Text += line.Replace(App.InstallerDir.FullName, "$(InstallerPath)") + "\r\n";
+                OutputBoxWriteLine(line.Replace(App.InstallerDir.FullName, "$(InstallerPath)"));
                 if (line.Contains("HRESULT"))
                 {
                     // Error occurred
@@ -173,6 +173,11 @@ private async void Step_Loaded(object sender, RoutedEventArgs e)
             }
         }
 
+        private void OutputBoxWriteLine(string line)
+        {
+            OutputBox.Text += line + "\r\n";
+        }
+
         public void Cancel()
         {
             try