diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index f41848dc..0887d89b 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -2144,7 +2144,12 @@ class ElectrumWindow(QMainWindow): def read_tx_from_qrcode(self): - data = run_hook('scan_qr_hook') + from electrum import qrscanner + try: + data = qrscanner.scan_qr(self.config) + except BaseException, e: + QMessageBox.warning(self, _('Error'), _(e), _('OK')) + return if not data: return # transactions are binary, but qrcode seems to return utf8... diff --git a/lib/qrscanner.py b/lib/qrscanner.py index a45e1520..0b712e60 100644 --- a/lib/qrscanner.py +++ b/lib/qrscanner.py @@ -8,7 +8,7 @@ except ImportError: def scan_qr(config): if not zbar: - return + raise BaseException("The zbar package is not available.\nOn Linux, try 'sudo apt-get install python-zbar'") device = config.get("video_device", "default") if device == 'default': device = ''