lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2026-01-01 07:48:07 +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

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

@@ -40,6 +40,8 @@ namespace Tester.Winform
} }
protected override void OnFormClosing(FormClosingEventArgs e) protected override void OnFormClosing(FormClosingEventArgs e)
{
if (_twain != null)
{ {
if (e.CloseReason == CloseReason.UserClosing && _twain.State > 4) if (e.CloseReason == CloseReason.UserClosing && _twain.State > 4)
{ {
@@ -49,6 +51,7 @@ namespace Tester.Winform
{ {
CleanupTwain(); CleanupTwain();
} }
}
base.OnFormClosing(e); base.OnFormClosing(e);
} }
@@ -104,8 +107,6 @@ namespace Tester.Winform
} }
private void CleanupTwain() private void CleanupTwain()
{
if (_twain != null)
{ {
if (_twain.State == 4) if (_twain.State == 4)
{ {
@@ -122,7 +123,6 @@ namespace Tester.Winform
_twain.ForceStepDown(2); _twain.ForceStepDown(2);
} }
} }
}
#endregion #endregion