diff --git a/NTwain/Properties/VersionInfo.cs b/NTwain/Properties/VersionInfo.cs index 8d827f4..2f2ce7b 100644 --- a/NTwain/Properties/VersionInfo.cs +++ b/NTwain/Properties/VersionInfo.cs @@ -14,6 +14,6 @@ namespace NTwain // keep this same in majors releases public const string Release = "2.0.0.0"; // change this for each nuget release - public const string Build = "2.0.2"; + public const string Build = "2.0.3"; } } \ No newline at end of file diff --git a/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs b/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs index f1e8a37..5cec36a 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs @@ -15,7 +15,7 @@ namespace NTwain.Triplets /// public ReturnCode Get(TWImageMemXfer xfer) { - Session.VerifyState(6, 6, DataGroups.Image, DataArgumentType.ImageMemFileXfer, Message.Get); + Session.VerifyState(6, 7, DataGroups.Image, DataArgumentType.ImageMemFileXfer, Message.Get); return Dsm.DsmEntry(Session.AppId, Session.CurrentSource.Identity, Message.Get, xfer); } diff --git a/Tests/Tester.Winform/TestForm.cs b/Tests/Tester.Winform/TestForm.cs index 74050bb..bebe5f1 100644 --- a/Tests/Tester.Winform/TestForm.cs +++ b/Tests/Tester.Winform/TestForm.cs @@ -105,19 +105,22 @@ namespace Tester.Winform private void CleanupTwain() { - if (_twain.State == 4) + if (_twain != null) { - _twain.CurrentSource.Close(); - } - if (_twain.State == 3) - { - _twain.Close(); - } + if (_twain.State == 4) + { + _twain.CurrentSource.Close(); + } + if (_twain.State == 3) + { + _twain.Close(); + } - if (_twain.State > 2) - { - // normal close down didn't work, do hard kill - _twain.ForceStepDown(2); + if (_twain.State > 2) + { + // normal close down didn't work, do hard kill + _twain.ForceStepDown(2); + } } }