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

tester crashes on close if twain not initialized.

Browse Source
This commit is contained in:
soukoku
2014-06-26 06:50:48 -04:00
parent e639ca5429
commit f2e3196612
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Tests/Tester.Winform/TestForm.cs
View File

@@ -41,13 +41,16 @@ namespace Tester.Winform
protected override void OnFormClosing(FormClosingEventArgs e) protected override void OnFormClosing(FormClosingEventArgs e)
{ {
if (e.CloseReason == CloseReason.UserClosing && _twain.State > 4) if (_twain != null)
{ {
e.Cancel = true; if (e.CloseReason == CloseReason.UserClosing && _twain.State > 4)
} {
else e.Cancel = true;
{ }
CleanupTwain(); else
{
CleanupTwain();
}
} }
base.OnFormClosing(e); base.OnFormClosing(e);
} }
@@ -105,22 +108,19 @@ namespace Tester.Winform
private void CleanupTwain() private void CleanupTwain()
{ {
if (_twain != null) if (_twain.State == 4)
{ {
if (_twain.State == 4) _twain.CurrentSource.Close();
{ }
_twain.CurrentSource.Close(); if (_twain.State == 3)
} {
if (_twain.State == 3) _twain.Close();
{ }
_twain.Close();
}
if (_twain.State > 2) if (_twain.State > 2)
{ {
// normal close down didn't work, do hard kill // normal close down didn't work, do hard kill
_twain.ForceStepDown(2); _twain.ForceStepDown(2);
}
} }
} }