Fix wrong percentage assignment + check for thread access

CollapseLauncher · Jan 1, 2025 · 4091f81 · 4091f81
1 parent 2d4efba
commit 4091f81
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 11 deletions.
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/CachesPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/CachesPage.xaml.cs
@@ -180,22 +180,38 @@ private void RemoveEvent()
 
         private void _cacheTool_StatusChanged(object sender, TotalPerFileStatus e)
         {
-            DispatcherQueue?.TryEnqueue(() =>
+            if (!DispatcherQueue.HasThreadAccess)
+            {
+                DispatcherQueue?.TryEnqueue(Update);
+                return;
+            }
+
+            Update();
+            return;
+            void Update()
             {
                 CachesDataTableGrid.Visibility = e.IsAssetEntryPanelShow ? Visibility.Visible : Visibility.Collapsed;
-                CachesStatus.Text = e.ActivityStatus;
+                CachesStatus.Text              = e.ActivityStatus;
 
-                CachesTotalStatus.Text = e.ActivityAll;
+                CachesTotalStatus.Text                 = e.ActivityAll;
                 CachesTotalProgressBar.IsIndeterminate = e.IsProgressAllIndetermined;
-            });
+            }
         }
 
         private void _cacheTool_ProgressChanged(object sender, TotalPerFileProgress e)
         {
-            DispatcherQueue?.TryEnqueue(() =>
+            if (!DispatcherQueue.HasThreadAccess)
+            {
+                DispatcherQueue?.TryEnqueue(Update);
+                return;
+            }
+
+            Update();
+            return;
+            void Update()
             {
                 CachesTotalProgressBar.Value = e.ProgressAllPercentage;
-            });
+            }
         }
 
         private void ResetStatusAndButtonState()

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/RepairPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/RepairPage.xaml.cs
@@ -182,7 +182,15 @@ private void RemoveEvent()
 
         private void _repairTool_StatusChanged(object sender, TotalPerFileStatus e)
         {
-            DispatcherQueue?.TryEnqueue(() =>
+            if (!DispatcherQueue.HasThreadAccess)
+            {
+                DispatcherQueue?.TryEnqueue(Update);
+                return;
+            }
+
+            Update();
+            return;
+            void Update()
             {
                 RepairDataTableGrid.Visibility = e.IsAssetEntryPanelShow ? Visibility.Visible : Visibility.Collapsed;
                 RepairStatus.Text = e.ActivityStatus;
@@ -191,16 +199,24 @@ private void _repairTool_StatusChanged(object sender, TotalPerFileStatus e)
                 RepairTotalStatus.Text = e.ActivityAll;
                 RepairTotalProgressBar.IsIndeterminate = e.IsProgressAllIndetermined;
                 RepairPerFileProgressBar.IsIndeterminate = e.IsProgressPerFileIndetermined;
-            });
+            };
         }
 
         private void _repairTool_ProgressChanged(object sender, TotalPerFileProgress e)
         {
-            DispatcherQueue?.TryEnqueue(() =>
+            if (!DispatcherQueue.HasThreadAccess)
+            {
+                DispatcherQueue?.TryEnqueue(Update);
+                return;
+            }
+
+            Update();
+            return;
+            void Update()
             {
                 RepairPerFileProgressBar.Value = Math.Min(e.ProgressPerFilePercentage, 100);
-                RepairTotalProgressBar.Value   = Math.Min(e.ProgressPerFilePercentage, 100);
-            });
+                RepairTotalProgressBar.Value   = Math.Min(e.ProgressAllPercentage, 100);
+            };
         }
 
         private void ResetStatusAndButtonState()