lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2026-02-25 13:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed #30 version check logic.

Browse Source
This commit is contained in:
soukoku
2014-12-29 18:07:34 -05:00
parent cad36ecf0b
commit 0ad1a72bba
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NTwain/Properties/VersionInfo.cs
View File

@@ -23,7 +23,7 @@ namespace NTwain
/// <summary> /// <summary>
/// The build release version number. /// The build release version number.
/// </summary> /// </summary>
public const string Build = "3.2.3"; // change this for each nuget release public const string Build = "3.2.4"; // change this for each nuget release
} }

5
NTwain/TwainSessionInternal.cs
View File

@@ -122,8 +122,8 @@ namespace NTwain
{ {
Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: EnableSource with {1}.", Thread.CurrentThread.ManagedThreadId, mode)); Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: EnableSource with {1}.", Thread.CurrentThread.ManagedThreadId, mode));
// app v2.2 or higher uses callback2 // per the spec (8-10) app v2.2 or higher uses callback2
if (_appId.ProtocolMajor >= 2 && _appId.ProtocolMinor >= 2) if (_appId.ProtocolMajor > 2 || (_appId.ProtocolMajor >= 2 && _appId.ProtocolMinor >= 2))
{ {
var cb = new TWCallback2(HandleCallback); var cb = new TWCallback2(HandleCallback);
var rc2 = ((ITwainSessionInternal)this).DGControl.Callback2.RegisterCallback(cb); var rc2 = ((ITwainSessionInternal)this).DGControl.Callback2.RegisterCallback(cb);
@@ -136,6 +136,7 @@ namespace NTwain
} }
else else
{ {
// all else try old callback
var cb = new TWCallback(HandleCallback); var cb = new TWCallback(HandleCallback);
var rc2 = ((ITwainSessionInternal)this).DGControl.Callback.RegisterCallback(cb); var rc2 = ((ITwainSessionInternal)this).DGControl.Callback.RegisterCallback(cb);