Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ied206 committed Oct 25, 2019
2 parents 583c793 + 27057de commit 0906d4d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 2 additions & 4 deletions ManagedWimLib/ManagedWimLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PackageId>ManagedWimLib</PackageId>
<Title>ManagedWimLib</Title>
<LangVersion>latest</LangVersion>
<Version>1.4.1</Version>
<Version>1.4.2</Version>
<Authors>Eric Biggers, Hajin Jang</Authors>
<Company>Joveler</Company>
<Description>Native wimlib wrapper library for .Net.
Expand All @@ -17,9 +17,7 @@ Supports Windows, Linux and macOS.</Description>
<PackageIcon>images\Logo.png</PackageIcon>
<RepositoryUrl>https://github.com/ied206/ManagedWimLib</RepositoryUrl>
<PackageReleaseNotes>- (v1.4) Support macOS platform
- Fix Wim.GetErrors(), Wim.GetLastError() regression
- Fix Wim.RootPath, Wim.PathSeparator regression
- Error print state is now readable from Wim.ErrorPrintState</PackageReleaseNotes>
- Fix Wim.GlobalCleanup() crash</PackageReleaseNotes>
<PackageTags>wim wimlib dism imagex archive native pinvoke interop</PackageTags>
</PropertyGroup>
<Import Project="$(MSBuildProjectDirectory)\ManagedWimLib.targets" />
Expand Down
8 changes: 4 additions & 4 deletions ManagedWimLib/WimLibLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,10 @@ protected override void LoadFunctions()

protected override void ResetFunctions()
{
#region (Code) Cleanup ErrorFile
SetPrintErrors(false);
#endregion

#region Global - GlobalInit, GlobalCleanup
GlobalInit = null;
GlobalCleanup = null;
Expand Down Expand Up @@ -513,10 +517,6 @@ protected override void ResetFunctions()
Utf8.Write = null;
Overwrite = null;
#endregion

#region (Code) Cleanup ErrorFile
SetPrintErrors(false);
#endregion
}
#endregion

Expand Down

0 comments on commit 0906d4d

Please sign in to comment.