From c6d5ebe9fb1529be863d8378a87dc3216a04013b Mon Sep 17 00:00:00 2001 From: Ulrich Deiters Date: Sat, 22 Mar 2003 16:31:52 +0000 Subject: [PATCH] Modified behaviour of the option "eject after each scan": Eject is suppresed for film scanners after preview scans. --- ChangeLog | 5 +++++ backend/canon.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c99fc098b..673ceb63b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-22 Ulrich Deiters + + * backend/canon.c: Modified the option "eject after each scan" - + Eject is suppressed for film scanners after preview scans. + 2003-03-20 Henning Meier-Geinitz * doc/descriptions/unsupported.desc: Added Canon LIDE 50, IBM diff --git a/backend/canon.c b/backend/canon.c index 20f38fdc1..ea2a05076 100644 --- a/backend/canon.c +++ b/backend/canon.c @@ -1058,7 +1058,8 @@ do_cancel (CANON_Scanner * s) if (s->fd >= 0) { - if (s->val[OPT_EJECT_AFTERSCAN].w == SANE_TRUE) + if (s->val[OPT_EJECT_AFTERSCAN].w && ! (s->val[OPT_PREVIEW].w + && s->hw->info.is_filmscanner)) { DBG (3, "do_cancel: sending MEDIUM POSITION\n"); status = medium_position (s->fd);