Browse Source

fix raise UserCacnelled calls (#6304)

bip39-recovery
zebra-lucky 5 years ago
committed by GitHub
parent
commit
949b247b19
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      electrum/gui/qt/installwizard.py
  2. 2
      electrum/plugins/trezor/clientbase.py

4
electrum/gui/qt/installwizard.py

@ -299,7 +299,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
def run_user_interaction_loop():
while True:
if self.loop.exec_() != 2: # 2 = next
raise UserCancelled
raise UserCancelled()
assert temp_storage
if temp_storage.file_exists() and not temp_storage.is_encrypted():
break
@ -423,7 +423,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
self.set_layout(layout, title, next_enabled)
result = self.loop.exec_()
if not result and raise_on_cancel:
raise UserCancelled
raise UserCancelled()
if result == 1:
raise GoBack from None
self.title.setVisible(False)

2
electrum/plugins/trezor/clientbase.py

@ -79,7 +79,7 @@ class TrezorClientBase(HardwareClientBase, Logger):
self.end_flow()
if e is not None:
if isinstance(e, Cancelled):
raise UserCancelled from e
raise UserCancelled() from e
elif isinstance(e, TrezorFailure):
raise RuntimeError(str(e)) from e
elif isinstance(e, OutdatedFirmwareError):

Loading…
Cancel
Save