Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/scan.py
diff options
context:
space:
mode:
Diffstat (limited to 'scan.py')
-rw-r--r--scan.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/scan.py b/scan.py
index b8a5b98..faa403d 100644
--- a/scan.py
+++ b/scan.py
@@ -525,10 +525,10 @@ class ScanThread(threading.Thread):
self._images = images
finally:
- logging.debug('_scan(): closing iterator')
+ logging.debug('_scan_multi(): closing iterator')
# make sure the scan is "cancelled" _now_
del scan_iter
- logging.debug('_scan(): iterator closed')
+ logging.debug('_scan_multi(): iterator closed')
@trace()
def _check_action(self, actions):
@@ -906,8 +906,9 @@ class ScanActivity(activity.Activity):
if not exc:
self._set_status('ready')
- else:
- self._open_scanner(self._current_scanner_name)
+
+ # always re-open scanner, to work around HPLIP bugs
+ self._open_scanner(self._current_scanner_name)
def _add_images(self, image_infos):
for info in image_infos: