lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-04-05 20:59:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added check for msg loop hook being null.

Browse Source
This commit is contained in:
Eugene 2017-04-24 10:11:41 -04:00
parent 89a87dea36
commit 143e36e996
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NTwain/TwainSession.cs
View File

@ -280,7 +280,7 @@ namespace NTwain
public ReturnCode Close()
{
var rc = ReturnCode.Failure;
_msgLoopHook.Invoke(() =>
_msgLoopHook?.Invoke(() =>
{
PlatformInfo.Current.Log.Debug("Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId);
@ -289,6 +289,7 @@ namespace NTwain
{
PlatformInfo.InternalCurrent.MemoryManager = null;
_msgLoopHook.Stop();
_msgLoopHook = null;
}
});
return rc;
@ -398,7 +399,7 @@ namespace NTwain
// success, the return status from DG_CONTROL / DAT_PENDINGXFERS / MSG_ENDXFER may
// be ignored.
_msgLoopHook.Invoke(() =>
_msgLoopHook?.Invoke(() =>
{
if (targetState < 7 && CurrentSource != null)
{

6
src/NTwain/TwainSessionInternal.cs
View File

@ -163,7 +163,7 @@ namespace NTwain
DisableReason = Message.Null;
var rc = ReturnCode.Failure;
_msgLoopHook.Invoke(() =>
_msgLoopHook?.Invoke(() =>
{
PlatformInfo.Current.Log.Debug("Thread {0}: EnableSource with {1}.", Thread.CurrentThread.ManagedThreadId, mode);
@ -194,7 +194,7 @@ namespace NTwain
_disabling = true;
try
{
_msgLoopHook.Invoke(() =>
_msgLoopHook?.Invoke(() =>
{
PlatformInfo.Current.Log.Debug("Thread {0}: DisableSource.", Thread.CurrentThread.ManagedThreadId);
@ -276,7 +276,7 @@ namespace NTwain
// In any event the trick to get this thing working is to return from the callback first
// before trying to process the msg or there will be unpredictable errors.
_msgLoopHook.BeginInvoke(() =>
_msgLoopHook?.BeginInvoke(() =>
{
HandleSourceMsg(msg);
});