lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-09-18 09:44:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

May fix issue #10

Browse Source
This commit is contained in:
soukoku
2014-06-20 06:34:08 -04:00
parent af8223bbd0
commit 6087438b5d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
NTwain/Internals/TransferLogic.cs
View File

@@ -70,7 +70,15 @@ namespace NTwain.Internals
if (xferGroup == DataGroups.None ||
(xferGroup & DataGroups.Image) == DataGroups.Image)
{
var mech = session.CurrentSource.CapGetCurrent(CapabilityId.ICapXferMech).ConvertToEnum<XferMech>();
// default to memory
var mech = XferMech.Memory;
object mechRaw = session.CurrentSource.CapGetCurrent(CapabilityId.ICapXferMech);
if (mechRaw != null)
{
mech = mechRaw.ConvertToEnum<XferMech>();
}
switch (mech)
{
case XferMech.Memory:
@@ -108,7 +116,9 @@ namespace NTwain.Internals
#endregion
} while (rc == ReturnCode.Success && pending.Count != 0);
// some poorly written scanner drivers return failure on EndXfer so only check for pending count now
//} while (rc == ReturnCode.Success && pending.Count != 0);
} while (pending.Count != 0);
session.ChangeState(5, true);
session.DisableSource();