AaronFiore/electrum
1
0
Fork 0
Code Activity

init qrscanner processor in scan_qr

Browse Source
This commit is contained in:
ThomasV
2014-10-24 17:11:05 +02:00
parent bfbd6f0e9d
commit 311a91c03c
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/qt/main_window.py
View File

@@ -2144,12 +2144,6 @@ class ElectrumWindow(QMainWindow):
def read_tx_from_qrcode(self):
from electrum import qrscanner
if qrscanner.proc is None:
try:
qrscanner.init(self.config)
except Exception, e:
QMessageBox.warning(self, _('Error'), _(e), _('OK'))
return
try:
data = qrscanner.scan_qr(self.config)
except BaseException, e:

8
gui/qt/qrtextedit.py
View File

@@ -53,17 +53,11 @@ class ScanQRTextEdit(QRTextEdit):
def qr_input(self):
from electrum import qrscanner
if qrscanner.proc is None:
try:
qrscanner.init(self.win.config)
except Exception, e:
QMessageBox.warning(self, _('Error'), _(e), _('OK'))
return
try:
data = qrscanner.scan_qr(self.win.config)
except BaseException, e:
QMessageBox.warning(self, _('Error'), _(e), _('OK'))
return
return ""
if type(data) != str:
return
self.setText(data)