diff options
| author | Alessio Treglia <alessio@debian.org> | 2013-05-13 08:57:50 +0100 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2013-05-13 08:57:50 +0100 |
| commit | d670e5d2f26f878d1a7a40327356adbb28d16e3e (patch) | |
| tree | 2dac8b3fdd7843d05506769e692ce1b2611d8fed /src/scanner.vala | |
| parent | 93eebefec15eb81549cedb49a59190338a9d95e8 (diff) | |
| parent | 695f537db79b0921621b54998ae46f331fff9105 (diff) | |
Merge tag 'upstream/3.6.1'
Upstream version 3.6.1
Diffstat (limited to 'src/scanner.vala')
| -rw-r--r-- | src/scanner.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scanner.vala b/src/scanner.vala index 03f1e24..722f308 100644 --- a/src/scanner.vala +++ b/src/scanner.vala @@ -890,7 +890,7 @@ public class Scanner break; case ScanType.ADF_FRONT: if (!set_constrained_string_option (handle, option, index, adf_front_sources, null)) - if (!!set_constrained_string_option (handle, option, index, adf_sources, null)) + if (!set_constrained_string_option (handle, option, index, adf_sources, null)) warning ("Unable to set front ADF source, please file a bug"); break; case ScanType.ADF_BACK: @@ -1113,6 +1113,9 @@ public class Scanner private void do_complete_document () { + Sane.cancel (handle); + debug ("sane_cancel ()"); + job_queue.remove_link (job_queue); state = ScanState.IDLE; @@ -1226,9 +1229,6 @@ public class Scanner return; } - Sane.cancel (handle); - debug ("sane_cancel ()"); - do_complete_document (); } |