diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
commit | 324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch) | |
tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /backend/tamarack.c | |
parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
parent | 1edb02101a9306fc711cd422ed507d18165b1691 (diff) |
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/tamarack.c')
-rw-r--r-- | backend/tamarack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/tamarack.c b/backend/tamarack.c index e7073af..6fc259f 100644 --- a/backend/tamarack.c +++ b/backend/tamarack.c @@ -470,7 +470,7 @@ do_cancel (Tamarack_Scanner *s) do_eof (s); - if (s->reader_pid != -1) + if (sanei_thread_is_valid (s->reader_pid)) { int exit_status; @@ -1442,7 +1442,7 @@ sane_cancel (SANE_Handle handle) { Tamarack_Scanner *s = handle; - if (s->reader_pid != -1) + if (sanei_thread_is_valid (s->reader_pid)) sanei_thread_kill (s->reader_pid); s->scanning = SANE_FALSE; } |