From 4901aebde0b3168fc22f4e79df9b715a84b76b28 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Tue, 9 Feb 2016 19:45:14 +0100 Subject: [PATCH] kivy: do not crash app if there's no barcode scanner --- gui/kivy/main_window.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py index 2d6d4662..f038341b 100644 --- a/gui/kivy/main_window.py +++ b/gui/kivy/main_window.py @@ -277,8 +277,10 @@ class ElectrumWindow(App): if intent.getStringExtra("SCAN_RESULT_FORMAT") == 'QR_CODE': on_complete(contents) activity.bind(on_activity_result=on_qr_result) - PythonActivity.mActivity.startActivityForResult(intent, 0) - + try: + PythonActivity.mActivity.startActivityForResult(intent, 0) + except: + self.show_error('Could not start Barcode Scanner') def build(self): return Builder.load_file('gui/kivy/main.kv')