diff --git a/Patcher/PatchClient/PatchClient.csproj b/Patcher/PatchClient/PatchClient.csproj index b802792..27c7599 100644 --- a/Patcher/PatchClient/PatchClient.csproj +++ b/Patcher/PatchClient/PatchClient.csproj @@ -4,8 +4,8 @@ net6.0 true enable - 2.10.0 - 2.10.0 + 2.10.1 + 2.10.1 diff --git a/Patcher/PatchGenerator/PatchGenerator.csproj b/Patcher/PatchGenerator/PatchGenerator.csproj index 3a62d2c..3116ee1 100644 --- a/Patcher/PatchGenerator/PatchGenerator.csproj +++ b/Patcher/PatchGenerator/PatchGenerator.csproj @@ -4,8 +4,8 @@ net6.0 true enable - 2.10.0 - 2.10.0 + 2.10.1 + 2.10.1 diff --git a/Patcher/PatchGenerator/Resources/PatchClient.exe b/Patcher/PatchGenerator/Resources/PatchClient.exe index 924cd0c..717dfc1 100644 --- a/Patcher/PatchGenerator/Resources/PatchClient.exe +++ b/Patcher/PatchGenerator/Resources/PatchClient.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:633df532bcdd3b1c6a1fa8a0179a4ec1d6e2a7f2d9fbed9648bdbb61e29c5aef -size 102612425 +oid sha256:a2f2315e664995795da5fc406062b3987309ec7664784cac290e5a46865d029c +size 102628809 diff --git a/Patcher/PatcherUtils/Helpers/XdeltaProcessHelper.cs b/Patcher/PatcherUtils/Helpers/XdeltaProcessHelper.cs index cd4af72..836145e 100644 --- a/Patcher/PatcherUtils/Helpers/XdeltaProcessHelper.cs +++ b/Patcher/PatcherUtils/Helpers/XdeltaProcessHelper.cs @@ -29,24 +29,34 @@ public class XdeltaProcessHelper private bool RunNormal() { - using var proc = new Process(); - - proc.StartInfo = new ProcessStartInfo + try { - FileName = LazyOperations.XDelta3Path, - Arguments = $"{_args} \"{_sourcePath}\" \"{_deltaPath}\" \"{_decodedPath}\"", - CreateNoWindow = true - }; + using var proc = new Process(); + + proc.StartInfo = new ProcessStartInfo + { + FileName = LazyOperations.XDelta3Path, + Arguments = $"{_args} \"{_sourcePath}\" \"{_deltaPath}\" \"{_decodedPath}\"", + CreateNoWindow = true + }; + + proc.Start(); + + if (!proc.WaitForExit(_timeout)) + { + PatchLogger.LogError("xdelta3 process timed out"); + PatchLogger.LogDebug($"xdelta exit code: {proc.ExitCode}"); + return false; + } - if (proc.WaitForExit(_timeout)) - { - PatchLogger.LogError("xdelta3 process timed out"); PatchLogger.LogDebug($"xdelta exit code: {proc.ExitCode}"); + return true; + } + catch (Exception ex) + { + PatchLogger.LogException(ex); return false; } - - PatchLogger.LogDebug($"xdelta exit code: {proc.ExitCode}"); - return true; } private bool DebugPathsCheck()