Browse Source

Handle already existing wallet file on recover

Related to cdde41e162
master
Kristaps Kaupe 6 years ago
parent
commit
ed825d5cc8
No known key found for this signature in database
GPG Key ID: D47B1B4232B55437
  1. 5
      scripts/joinmarket-qt.py

5
scripts/joinmarket-qt.py

@ -1460,6 +1460,7 @@ class JMMainWindow(QMainWindow):
self.close() self.close()
def recoverWallet(self): def recoverWallet(self):
try:
success = wallet_generate_recover_bip39("recover", "wallets", success = wallet_generate_recover_bip39("recover", "wallets",
"wallet.jmdat", "wallet.jmdat",
callbacks=(None, self.seedEntry, callbacks=(None, self.seedEntry,
@ -1471,6 +1472,10 @@ class JMMainWindow(QMainWindow):
mbtype='warn', mbtype='warn',
title="Error") title="Error")
return return
except Exception as e:
JMQtMessageBox(self, e.args[0], title="Error", mbtype="warn")
return
JMQtMessageBox(self, 'Wallet saved to ' + self.walletname, JMQtMessageBox(self, 'Wallet saved to ' + self.walletname,
title="Wallet created") title="Wallet created")
self.initWallet(seed=self.walletname, restart_cb=self.restartWithMsg) self.initWallet(seed=self.walletname, restart_cb=self.restartWithMsg)

Loading…
Cancel
Save