electrum

Electrum Bitcoin wallet
git clone https://git.parazyd.org/electrum
Log | Files | Refs | Submodules

commit 7e36770a067209836fb6d3c78f7272420543ba5e
parent eb6eac92544034b487fa04a6b422537c1de9f348
Author: ThomasV <thomasv@electrum.org>
Date:   Thu, 31 Dec 2020 13:00:24 +0100

fix #6605

Diffstat:
Melectrum/gui/qt/installwizard.py | 27+++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/electrum/gui/qt/installwizard.py b/electrum/gui/qt/installwizard.py @@ -248,18 +248,21 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard): nonlocal temp_storage temp_storage = None msg = None - path = os.path.join(wallet_folder, filename) - wallet_from_memory = get_wallet_from_daemon(path) - try: - if wallet_from_memory: - temp_storage = wallet_from_memory.storage # type: Optional[WalletStorage] - else: - temp_storage = WalletStorage(path) - except (StorageReadWriteError, WalletFileException) as e: - msg = _('Cannot read file') + f'\n{repr(e)}' - except Exception as e: - self.logger.exception('') - msg = _('Cannot read file') + f'\n{repr(e)}' + if filename: + path = os.path.join(wallet_folder, filename) + wallet_from_memory = get_wallet_from_daemon(path) + try: + if wallet_from_memory: + temp_storage = wallet_from_memory.storage # type: Optional[WalletStorage] + else: + temp_storage = WalletStorage(path) + except (StorageReadWriteError, WalletFileException) as e: + msg = _('Cannot read file') + f'\n{repr(e)}' + except Exception as e: + self.logger.exception('') + msg = _('Cannot read file') + f'\n{repr(e)}' + else: + msg = _('') self.next_button.setEnabled(temp_storage is not None) user_needs_to_enter_password = False if temp_storage: