cancel downloads before showing error message if a patch failed

goatcorp · Apr 13, 2024 · 6e0829a · 6e0829a
1 parent bb642f3
commit 6e0829a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/src/XIVLauncher.Common/Game/Patch/PatchManager.cs b/src/XIVLauncher.Common/Game/Patch/PatchManager.cs
@@ -236,9 +236,9 @@ void HandleError(string context)
 
                     this.hasError = true;
 
+                    CancelAllDownloads();
                     OnFail?.Invoke(download.Patch, context);
 
-                    CancelAllDownloads();
                     Task.Run(async () => await UnInitializeAcquisition(), new CancellationTokenSource(5000).Token).GetAwaiter().GetResult();
 
                     try
@@ -250,7 +250,7 @@ void HandleError(string context)
                         // This is fine. We will catch it next try.
                         Log.Error(ex, "Could not delete patch file");
                     }
-                    
+
                     Environment.Exit(0);
                 }
 
@@ -302,10 +302,6 @@ void HandleError(string context)
 
         public void CancelAllDownloads()
         {
-            #if !DEBUG
-            return;
-            #endif
-
             foreach (var downloadService in DownloadServices)
             {
                 if (downloadService == null)
@@ -469,7 +465,7 @@ private static HashCheckResult CheckPatchValidity(PatchListEntry patchListEntry,
                 return HashCheckResult.UnknownHashType;
             }
 
-            var stream = path.OpenRead();
+            using var stream = path.OpenRead();
 
             if (stream.Length != patchListEntry.Length)
             {
@@ -503,11 +499,9 @@ private static HashCheckResult CheckPatchValidity(PatchListEntry patchListEntry,
                 if (sb.ToString() == patchListEntry.Hashes[i])
                     continue;
 
-                stream.Close();
                 return HashCheckResult.BadHash;
             }
 
-            stream.Close();
             return HashCheckResult.Pass;
         }
 

diff --git a/src/XIVLauncher/Windows/PatchDownloadDialog.xaml b/src/XIVLauncher/Windows/PatchDownloadDialog.xaml
@@ -31,7 +31,7 @@
                 <TextBlock x:Name="InstallingText" Foreground="{DynamicResource MaterialDesignBody}" HorizontalAlignment="Center" Text="{Binding PatchInstallingLoc}"></TextBlock>
                 <ProgressBar IsIndeterminate="True" Margin="0,0,0,11" />
 
-                <TextBlock x:Name="BytesLeftText" Foreground="DarkGray" Margin="0,8,0,12" TextAlignment="Center" Text="{Binding PatchPreparingLoc}" MouseLeftButtonUp="BytesLeftText_OnMouseLeftButtonUp"/>
+                <TextBlock x:Name="BytesLeftText" Foreground="DarkGray" Margin="0,8,0,12" TextAlignment="Center" Text="{Binding PatchPreparingLoc}"/>
             </StackPanel>
         </materialDesign:Card>
     </Grid>

diff --git a/src/XIVLauncher/Windows/PatchDownloadDialog.xaml.cs b/src/XIVLauncher/Windows/PatchDownloadDialog.xaml.cs
@@ -169,12 +169,5 @@ private void PatchDownloadDialog_OnClosing(object sender, CancelEventArgs e)
         {
             e.Cancel = true; // We can't cancel patching yet, big TODO
         }
-
-        private void BytesLeftText_OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-#if DEBUG
-            _manager.CancelAllDownloads();
-#endif
-        }
     }
 }