Merge branch 'master' of github.com:Spesmilo/Electrum

2012-08-03 16:13:49 -03:00
parent 99f71a188f 2791ecc167
commit da5571a870
2 changed files with 9 additions and 0 deletions
--- a/lib/qrscanner.py
+++ b/lib/qrscanner.py
@@ -11,6 +11,14 @@ from urlparse import urlparse, parse_qs
 def is_available():
    if not zbar:
        return False
+
+    try:
+        proc = zbar.Processor()
+        proc.init()
+    except zbar.SystemError:
+        # Cannot open video device
+        return False
+
    return True

 def scan_qr():