From 09dcdbf190cb7b75433c0ef2144ce2b02c75b374 Mon Sep 17 00:00:00 2001
From: aianlinb <ianlin0110g@gmail.com>
Date: Sat, 26 Sep 2020 21:00:11 +0800
Subject: [PATCH] Handle exceptions on saving thread

---
 VisualBundle/MainWindow.xaml.cs | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/VisualBundle/MainWindow.xaml.cs b/VisualBundle/MainWindow.xaml.cs
index 2c050e5..4c0ee5f 100644
--- a/VisualBundle/MainWindow.xaml.cs
+++ b/VisualBundle/MainWindow.xaml.cs
@@ -28,7 +28,7 @@ public MainWindow()
         public void OnUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             var ew = new ErrorWindow();
-            var t = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(ew.ShowError))
+            var t = new Thread(new ParameterizedThreadStart(ew.ShowError))
             {
                 CurrentUICulture = new System.Globalization.CultureInfo("en-US")
             };
@@ -409,18 +409,30 @@ private void OnButtonSaveClick(object sender, RoutedEventArgs e)
             ButtonSave.IsEnabled = false;
             var sw = new SavingWindow();
             var t = new Thread(new ThreadStart(() => {
-                var i = 1;
-                var text = "Saving {0} / " + (changed.Count + 1).ToString() + " bundles . . .";
-                foreach (var br in changed)
+                try
                 {
+                    var i = 1;
+                    var text = "Saving {0} / " + (changed.Count + 1).ToString() + " bundles . . .";
+                    foreach (var br in changed)
+                    {
+                        Dispatcher.Invoke(() => { sw.TextBlock1.Text = string.Format(text, i); });
+                        br.Save(br.Name);
+                        i++;
+                    }
                     Dispatcher.Invoke(() => { sw.TextBlock1.Text = string.Format(text, i); });
-                    br.Save(br.Name);
-                    i++;
+                    ic.Save("_.index.bin");
+                    sw.Closing -= sw.OnClosing;
+                    Dispatcher.Invoke(sw.Close);
+                } catch (Exception ex)
+                {
+                    var ew = new ErrorWindow();
+                    var tr = new Thread(new ParameterizedThreadStart(ew.ShowError))
+                    {
+                        CurrentUICulture = new System.Globalization.CultureInfo("en-US")
+                    };
+                    tr.Start(ex);
+                    Dispatcher.Invoke(() => { if (ew.ShowDialog() != true) Close(); });
                 }
-                Dispatcher.Invoke(() => { sw.TextBlock1.Text = string.Format(text, i); });
-                ic.Save("_.index.bin");
-                sw.Closing -= sw.OnClosing;
-                Dispatcher.Invoke(sw.Close);
             }));
             t.Start();
             sw.ShowDialog();