Fix crash

Fix the exception of exporting file after saving. Fix the error of handling exception in saving thread.
aianlinb · Oct 1, 2020 · 19f825c · 19f825c
1 parent 468b244
commit 19f825c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/LibBundle/BundleContainer.cs b/LibBundle/BundleContainer.cs
@@ -108,8 +108,6 @@ private void Initialize(BinaryReader br)
         //UnPacking
         public MemoryStream Read(BinaryReader br = null)
         {
-            if (dataToSave != null)
-                throw new NotSupportedException("Save() cannot be called when it's implemented using a constructor with data and path parameters");
             if (br == null)
                 if (path == null)
                     throw new ArgumentException("BundleContainer implemented using a constructor with BinaryReader parameters must include the br parameter when calling Read()", "br");

diff --git a/LibBundle/Properties/AssemblyInfo.cs b/LibBundle/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/VisualBundle/MainWindow.xaml b/VisualBundle/MainWindow.xaml
@@ -1,9 +1,9 @@
 <Window x:Class="VisualBundle.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="VisualBundle v1.1.0" Height="480" Width="800" Loaded="OnLoaded" Closing="OnWindowClosing">
+        Title="VisualBundle v1.2.0" Height="480" Width="800" Loaded="OnLoaded" Closing="OnWindowClosing">
     <Window.Resources>
-        <HierarchicalDataTemplate x:Key="FileViewItemTemplate" DataType="x:Type self:ItemModel" ItemsSource="{Binding ChildItems}">
+        <HierarchicalDataTemplate x:Key="FileViewItemTemplate" DataType="x:Type VisualBundle:ItemModel" ItemsSource="{Binding ChildItems}">
             <StackPanel Orientation="Horizontal">
                 <Image Source="{Binding Icon}" Width="20" Height="20"/>
                 <TextBlock Text="{Binding Name}" FontSize="16"/>

diff --git a/VisualBundle/MainWindow.xaml.cs b/VisualBundle/MainWindow.xaml.cs
@@ -524,13 +524,15 @@ private void OnButtonSaveClick(object sender, RoutedEventArgs e)
                     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(() => {
+                        var ew = new ErrorWindow();
+                        var tr = new Thread(new ParameterizedThreadStart(ew.ShowError))
+                        {
+                            CurrentUICulture = new System.Globalization.CultureInfo("en-US")
+                        };
+                        tr.Start(ex);
+                        if (ew.ShowDialog() != true) Close();
+                    });
                 }
             }));
             t.Start();

diff --git a/VisualBundle/Properties/AssemblyInfo.cs b/VisualBundle/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/VisualBundle/SavingWindow.xaml b/VisualBundle/SavingWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="VisualBundle.SavingWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Saving" Height="100" Width="300">
+        Title="Saving" Height="100" Width="300" WindowStartupLocation="CenterScreen">
     <Grid>
         <TextBlock x:Name="TextBlock1" TextWrapping="Wrap" Text="Saving 0 / 0 bundles . . ." VerticalAlignment="Center" HorizontalAlignment="Center"/>
     </Grid>