AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: scan_qr_non_android: handle user closing window

Browse Source 
handle user closing window without scanning a qr code
(i.e. cancelling scan)
This commit is contained in:
SomberNight
2021-06-25 14:25:01 +02:00
parent f1e77b6e43
commit bc5ec96387
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/qrscanner.py
View File

@@ -26,6 +26,7 @@
import os
import sys
import ctypes
from typing import Optional
from .util import UserFacingException
from .i18n import _
@@ -53,7 +54,7 @@ except BaseException as e1:
_logger.error(f"failed to load zbar. exceptions: {[e1,e2]!r}")
def scan_barcode_ctypes(device='', timeout=-1, display=True, threaded=False):
def scan_barcode_ctypes(device='', timeout=-1, display=True, threaded=False) -> Optional[str]:
if libzbar is None:
raise UserFacingException("Cannot start QR scanner: zbar not available.")
libzbar.zbar_symbol_get_data.restype = ctypes.c_char_p