ttrezor/keepkey: silence UserCancelled during recovery - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 034b0a03130138db53661de29cdac0a66a499f12
DIR parent 6e0650b909f434b74688f42e072720210f06782c
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 1 May 2018 22:49:43 +0200
ttrezor/keepkey: silence UserCancelled during recovery
Diffstat:
M plugins/keepkey/keepkey.py | 4 +++-
M plugins/trezor/trezor.py | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
DIR diff --git a/plugins/keepkey/keepkey.py b/plugins/keepkey/keepkey.py
t@@ -2,7 +2,7 @@ from binascii import hexlify, unhexlify
import traceback
import sys
-from electrum.util import bfh, bh2u
+from electrum.util import bfh, bh2u, UserCancelled
from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey,
TYPE_ADDRESS, TYPE_SCRIPT,
is_segwit_address)
t@@ -186,6 +186,8 @@ class KeepKeyPlugin(HW_PluginBase):
def _initialize_device_safe(self, settings, method, device_id, wizard, handler):
try:
self._initialize_device(settings, method, device_id, wizard, handler)
+ except UserCancelled:
+ pass
except BaseException as e:
traceback.print_exc(file=sys.stderr)
handler.show_error(str(e))
DIR diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py
t@@ -2,7 +2,7 @@ from binascii import hexlify, unhexlify
import traceback
import sys
-from electrum.util import bfh, bh2u, versiontuple
+from electrum.util import bfh, bh2u, versiontuple, UserCancelled
from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey,
TYPE_ADDRESS, TYPE_SCRIPT, is_address)
from electrum import constants
t@@ -207,6 +207,8 @@ class TrezorPlugin(HW_PluginBase):
def _initialize_device_safe(self, settings, method, device_id, wizard, handler):
try:
self._initialize_device(settings, method, device_id, wizard, handler)
+ except UserCancelled:
+ pass
except BaseException as e:
traceback.print_exc(file=sys.stderr)
handler.show_error(str(e))