From ed825d5cc84065b4df371ae14631ef736f085f3a Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sat, 19 Oct 2019 16:28:50 +0300 Subject: [PATCH] Handle already existing wallet file on recover Related to cdde41e162fbdceb23f4580610d84466de47ee2b --- scripts/joinmarket-qt.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index 2443218..0a0e05e 100644 --- a/scripts/joinmarket-qt.py +++ b/scripts/joinmarket-qt.py @@ -1460,17 +1460,22 @@ class JMMainWindow(QMainWindow): self.close() def recoverWallet(self): - success = wallet_generate_recover_bip39("recover", "wallets", - "wallet.jmdat", - callbacks=(None, self.seedEntry, + try: + success = wallet_generate_recover_bip39("recover", "wallets", + "wallet.jmdat", + callbacks=(None, self.seedEntry, self.getPassword, self.getWalletFileName)) - if not success: - JMQtMessageBox(self, + if not success: + JMQtMessageBox(self, "Failed to recover wallet.", mbtype='warn', title="Error") + return + except Exception as e: + JMQtMessageBox(self, e.args[0], title="Error", mbtype="warn") return + JMQtMessageBox(self, 'Wallet saved to ' + self.walletname, title="Wallet created") self.initWallet(seed=self.walletname, restart_cb=self.restartWithMsg)