AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of git://github.com/spesmilo/electrum

Browse Source
This commit is contained in:
ThomasV
2015-12-23 10:54:45 +01:00
parent acbe67fd1f 6f4d4b9a1e
commit 8bcd132423
11 changed files with 179 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/qrscanner.py
View File

@@ -12,7 +12,7 @@ proc = None
def scan_qr(config):
global proc
if not zbar:
raise BaseException("\n".join([_("Cannot start QR scanner."),_("The zbar package is not available."),_("On Linux, try 'sudo pip install zbar'")]))
raise RuntimeError("\n".join([_("Cannot start QR scanner."),_("The zbar package is not available."),_("On Linux, try 'sudo pip install zbar'")]))
if proc is None:
device = config.get("video_device", "default")
if device == 'default':