修复部分问题

Xcube-Studio · Sep 15, 2024 · df56845 · df56845
1 parent ce78c9b
commit df56845
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Natsurainko.FluentCore b/Natsurainko.FluentCore
diff --git a/Natsurainko.FluentLauncher/Dictionaries/TaskViewStyleDictionary.xaml b/Natsurainko.FluentLauncher/Dictionaries/TaskViewStyleDictionary.xaml
@@ -245,9 +245,9 @@
 
                 <Grid Visibility="{Binding ShowException, Converter={ThemeResource BoolToVisibilityConverter}}">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="20" />
                         <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
                     <TextBlock

diff --git a/Natsurainko.FluentLauncher/ViewModels/Common/TaskViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Common/TaskViewModel.cs
@@ -366,9 +366,9 @@ protected override async void Run()
         {
             instance = await _installer.InstallAsync(_tokenSource.Token);
         }
-        catch (AggregateException aggregateException)
+        catch (Exception ex)
         {
-            if (aggregateException.InnerException is OperationCanceledException canceledException)
+            if (ex.InnerException is OperationCanceledException canceledException)
             {
                 resultState = TaskState.Cancelled;
                 Exception = canceledException;
@@ -379,17 +379,17 @@ protected override async void Run()
                     ExceptionReason = canceledException.Message;
                 });
             }
-        }
-        catch (Exception ex)
-        {
-            resultState = TaskState.Failed;
-            Exception = ex;
-
-            App.DispatcherQueue.TryEnqueue(() =>
+            else
             {
-                ShowException = true;
-                ExceptionReason = ex.Message;
-            });
+                resultState = TaskState.Failed;
+                Exception = ex;
+
+                App.DispatcherQueue.TryEnqueue(() =>
+                {
+                    ShowException = true;
+                    ExceptionReason = ex.Message;
+                });
+            }
         }
 
         App.DispatcherQueue.TryEnqueue(() =>