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

Merge pull request #71 from SteffenSH/v4-fixed-DetatchAsync

Browse Source 
Fix: CloseDSMAsync() hang in TwainAppSession
This commit is contained in:
Eugene Wang
2025-09-18 05:44:12 -04:00
committed by GitHub
parent 83ab3d5f0a 44e0c7ab07
commit f3e9907dfc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/NTwain/MessagePumpThread.cs
View File

@@ -69,12 +69,12 @@ namespace NTwain
/// <summary>
/// Detatches a previously attached session and stops the thread.
/// </summary>
public async Task<STS> DetatchAsync()
public async Task<STS> DetachAsync()
{
STS sts = default;
if (_dummyForm != null && _twain != null)
{
TaskCompletionSource<bool> tcs = new();
TaskCompletionSource<STS> tcs = new();
_dummyForm.BeginInvoke(() =>
{
sts = _twain.CloseDSMReal();
@@ -84,6 +84,7 @@ namespace NTwain
_dummyForm.Close();
_twain = null;
}
tcs.SetResult(sts);
});
await tcs.Task;
}

2
src/NTwain/TwainAppSession.cs
View File

@@ -144,7 +144,7 @@ namespace NTwain
{
if (_selfPump == null) throw new InvalidOperationException($"Cannot close if not opened with {nameof(OpenDSMAsync)}().");
var sts = await _selfPump.DetatchAsync();
var sts = await _selfPump.DetachAsync();
if (sts.IsSuccess)
{
_selfPump = null;