Merge pull request #162 from rankynbass/fix-game-repair

goatcorp · Jun 28, 2024 · 705e574 · 705e574
2 parents ed7bd94 + 3545da1
commit 705e574
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher
diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs
@@ -1049,7 +1049,7 @@ void UpdatePatchStatus()
             finally
             {
                 token.Cancel();
-                statusThread.Join(3000);
+                statusThread.Join(TimeSpan.FromMilliseconds(1000));
             }
 
             return true;
@@ -1149,7 +1149,7 @@ private async Task<bool> RepairGame(Launcher.LoginResult loginResult)
         Log.Information("STARTING REPAIR");
 
         // TODO: bundle the PatchInstaller with xl-core on Windows and run this remotely
-        using var verify = new PatchVerifier(Program.CommonSettings, loginResult, 20, loginResult.OauthLogin.MaxExpansion, false);
+        using var verify = new PatchVerifier(Program.CommonSettings, loginResult, TimeSpan.FromMilliseconds(100), loginResult.OauthLogin.MaxExpansion, false);
 
         for (bool doVerify = true; doVerify;)
         {
+1 −1		src/.editorconfig
+9 −3		src/XIVLauncher.Common/CommonUniqueIdCache.cs
+3 −3		src/XIVLauncher.Common/Game/IntegrityCheck.cs
+6 −5		src/XIVLauncher.Common/Game/Launcher.cs
+5 −5		src/XIVLauncher.Common/Game/Patch/PatchVerifier.cs
+131 −44		src/XIVLauncher.Common/Patching/IndexedZiPatch/IIndexedZiPatchIndexInstaller.cs
+188 −148		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchIndex.cs
+154 −118		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchIndexLocalInstaller.cs
+572 −581		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchIndexRemoteInstaller.cs
+614 −582		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchInstaller.cs
+159 −129		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchOperations.cs
+367 −347		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchPartLocator.cs
+172 −168		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchTargetFile.cs
+69 −51		src/XIVLauncher.Common/Patching/IndexedZiPatch/IndexedZiPatchTargetViewStream.cs
+3 −2		src/XIVLauncher.Common/Patching/ZiPatch/Chunk/SqpkCommand/SqpkFile.cs
+27 −1		src/XIVLauncher.Common/Patching/ZiPatch/Util/SqexFile.cs
+9 −9		src/XIVLauncher.Common/Patching/ZiPatch/Util/SqexFileStream.cs
+17 −3		src/XIVLauncher.Common/Patching/ZiPatch/Util/SqexFileStreamStore.cs
+4 −0		src/XIVLauncher.Common/Patching/ZiPatch/ZiPatchFile.cs
+206 −0		src/XIVLauncher.PatchInstaller/Commands/CheckIntegrityCommand.cs
+40 −0		src/XIVLauncher.PatchInstaller/Commands/IndexCreateCommand.cs
+268 −0		src/XIVLauncher.PatchInstaller/Commands/IndexCreateIntegrityCommand.cs
+58 −0		src/XIVLauncher.PatchInstaller/Commands/IndexRepairCommand.cs
+48 −0		src/XIVLauncher.PatchInstaller/Commands/IndexRpcCommand.cs
+109 −0		src/XIVLauncher.PatchInstaller/Commands/IndexRpcTestCommand.cs
+444 −0		src/XIVLauncher.PatchInstaller/Commands/IndexUpdateCommand.cs
+72 −0		src/XIVLauncher.PatchInstaller/Commands/IndexVerifyCommand.cs
+70 −0		src/XIVLauncher.PatchInstaller/Commands/InstallCommand.cs
+75 −0		src/XIVLauncher.PatchInstaller/Commands/RpcCommand.cs
+38 −141		src/XIVLauncher.PatchInstaller/Program.cs
+382 −0		src/XIVLauncher.PatchInstaller/Utilities/FileDownloader.cs
+3 −0		src/XIVLauncher.PatchInstaller/XIVLauncher.PatchInstaller.csproj
+1 −0		src/XIVLauncher.sln.DotSettings
+2 −12		src/XIVLauncher/Resources/CHANGELOG.txt
+2 −2		src/XIVLauncher/Windows/GameRepairProgressWindow.xaml.cs
+5 −2		src/XIVLauncher/Windows/ViewModel/MainWindowViewModel.cs
+1 −1		src/XIVLauncher/XIVLauncher.csproj