diff --git a/CHANGELOG.md b/CHANGELOG.md index d45615e3..619a0775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +#### Version - 2.5.0.3 - 6/26/2021 +* HOTFIX: Fix "argument out of range" error when installing modlists + #### Version - 2.5.0.2 - 6/25/2021 * HOTFIX: Fix for Nexus files that are downloadable but some API endpoints are unreachable diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index d307fa32..3b7e27a4 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.5.0.2 - 2.5.0.1 + 2.5.0.3 + 2.5.0.3 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.ImageHashing/DDSImage.cs b/Wabbajack.ImageHashing/DDSImage.cs index 2ded1078..84475a17 100644 --- a/Wabbajack.ImageHashing/DDSImage.cs +++ b/Wabbajack.ImageHashing/DDSImage.cs @@ -97,11 +97,17 @@ namespace Wabbajack.ImageHashing resized = _image.Resize(width, height, TEX_FILTER_FLAGS.DEFAULT); } - using var compressed = resized.Compress(newFormat, TEX_COMPRESS_FLAGS.BC7_QUICK, 0.5f); + + if (CompressedTypes.Contains(newFormat)) + { + var old = resized; + resized = resized.Compress(newFormat, TEX_COMPRESS_FLAGS.BC7_QUICK, 0.5f); + old.Dispose(); + } if (dest.Extension == new Extension(".dds")) { - compressed.SaveToDDSFile(DDS_FLAGS.NONE, dest.ToString()); + resized.SaveToDDSFile(DDS_FLAGS.NONE, dest.ToString()); } } finally diff --git a/Wabbajack.ImageHashing/ImageState.cs b/Wabbajack.ImageHashing/ImageState.cs index 323f79b7..6b31ec78 100644 --- a/Wabbajack.ImageHashing/ImageState.cs +++ b/Wabbajack.ImageHashing/ImageState.cs @@ -59,7 +59,7 @@ namespace Wabbajack.ImageHashing } catch (Exception ex) { - Utils.Log($"Error getting ImageState: {ex}"); + Utils.Log($"Unable to read image state (this is fine)"); return null; } finally diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 37586515..4b8741a5 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ Exe net5.0-windows true - 2.5.0.2 - 2.5.0.2 + 2.5.0.3 + 2.5.0.3 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 52212739..afb3be28 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe net5.0-windows - 2.5.0.2 - 2.5.0.2 + 2.5.0.3 + 2.5.0.3 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index b36e1286..0151b637 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.5.0.2 - 2.5.0.2 + 2.5.0.3 + 2.5.0.3 Copyright © 2019-2020 An automated ModList installer true