summaryrefslogtreecommitdiff
path: root/backend/test.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/test.c
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/test.c')
-rw-r--r--backend/test.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/test.c b/backend/test.c
index 2ca5b3b..3ead456 100644
--- a/backend/test.c
+++ b/backend/test.c
@@ -1375,7 +1375,7 @@ finish_pass (Test_Device * test_device)
DBG (2, "finish_pass: reader process terminated with status: %s\n",
sane_strstatus (status));
}
- test_device->reader_pid = -1;
+ sanei_thread_invalidate (test_device->reader_pid);
}
/* this happens when running in thread context... */
if (test_device->reader_fds >= 0)
@@ -1641,7 +1641,7 @@ sane_init (SANE_Int * __sane_unused__ version_code, SANE_Auth_Callback __sane_un
test_device->eof = SANE_FALSE;
test_device->scanning = SANE_FALSE;
test_device->cancelled = SANE_FALSE;
- test_device->reader_pid = -1;
+ sanei_thread_initialize (test_device->reader_pid);
test_device->pipe = -1;
DBG (4, "sane_init: new device: `%s' is a %s %s %s\n",
test_device->sane.name, test_device->sane.vendor,
@@ -2521,7 +2521,7 @@ sane_start (SANE_Handle handle)
{
test_device->number_of_scans++;
DBG (3, "sane_start: scanning page %d\n", test_device->number_of_scans);
-
+
if ((strcmp (test_device->val[opt_scan_source].s, "Automatic Document Feeder") == 0) &&
(((test_device->number_of_scans) % 11) == 0))
{