From fe5b70fa526b75733769244a1a71a7466193eecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 23 Jan 2014 19:01:38 +0100 Subject: [PATCH] [FIX] hw_scanner: start scanner thread on first use to prevent start during unit tests bzr revid: fva@openerp.com-20140123180138-1g342p7y2aiakr76 --- addons/hw_scanner/controllers/main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py index bb51a27b7e5..cd70a353372 100644 --- a/addons/hw_scanner/controllers/main.py +++ b/addons/hw_scanner/controllers/main.py @@ -175,16 +175,18 @@ class Scanner(Thread): except Exception as e: _logger.error('Could not read Barcode Scanner Events:\n Exception: '+str(e)) -if not openerp.tools.config["stop_after_init"]: - s = Scanner() - s.start() +s = Scanner() class ScannerDriver(hw_proxy.Proxy): @http.route('/hw_proxy/is_scanner_connected', type='json', auth='admin') def is_scanner_connected(self): + if not s.isAlive(): + s.start() return s.get_device() != None @http.route('/hw_proxy/scanner', type='json', auth='admin') def scanner(self): + if not s.isAlive(): + s.start() return s.get_barcode()