lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-12-01 10:54:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some name-breaking changes so master is now v3. V2 will continue to be the code on nuget for now.

Browse Source
This commit is contained in:
soukoku
2014-09-15 07:24:13 -04:00
parent 0cd02ac16e
commit 92063d2b84
62 changed files with 422 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
NTwain/TwainSessionInternal.cs
View File

@@ -42,7 +42,7 @@ namespace NTwain
return new TentativeStateCommitable(this, newState);
}
void ITwainSessionInternal.ChangeCurrentSource(TwainSource source)
void ITwainSessionInternal.ChangeCurrentSource(DataSource source)
{
CurrentSource = source;
OnPropertyChanged("CurrentSource");
@@ -148,18 +148,23 @@ namespace NTwain
_twui.ModalUI = modal;
_twui.hParent = windowHandle;
if (mode == SourceEnableMode.ShowUIOnly)
try
{
rc = ((ITwainSessionInternal)this).DGControl.UserInterface.EnableDSUIOnly(_twui);
if (mode == SourceEnableMode.ShowUIOnly)
{
rc = ((ITwainSessionInternal)this).DGControl.UserInterface.EnableDSUIOnly(_twui);
}
else
{
rc = ((ITwainSessionInternal)this).DGControl.UserInterface.EnableDS(_twui);
}
}
else
finally
{
rc = ((ITwainSessionInternal)this).DGControl.UserInterface.EnableDS(_twui);
}
if (rc != ReturnCode.Success)
{
_callbackObj = null;
if (rc != ReturnCode.Success)
{
_callbackObj = null;
}
}
});
return rc;
@@ -305,6 +310,5 @@ namespace NTwain
}
#endregion
}
}