[simple-scan/gnome-3-6: 2/5] Always call sane_cancel on the end of a document, this was not being called at the end of an ADF sca



commit a71b894dbcfe924009aeb4588bc677db1dfe3c9a
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Mar 22 09:15:35 2013 +1300

    Always call sane_cancel on the end of a document, this was not being called at the end of an ADF scan

 src/scanner.vala |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/scanner.vala b/src/scanner.vala
index c4c2970..722f308 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -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 ();
     }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]