GlcoinCore/joinmarket
1
0
Fork 0
mirror of https://github.com/JoinMarket-Org/joinmarket-clientserver.git synced 2026-08-13 12:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle already existing wallet file on recover

Browse source 
Related to cdde41e162
This commit is contained in:
Kristaps Kaupe 2019-10-19 16:28:50 +03:00
parent d421aea919
commit ed825d5cc8
No known key found for this signature in database
GPG key ID: D47B1B4232B55437
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/joinmarket-qt.py
View file

@ -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)