Browse Source

Merge #392: Fixes #389 - wallet syncing in Qt

bdc0ac5 Fixes #389 - wallet syncing in Qt (AdamISZ)
master
AdamISZ 6 years ago
parent
commit
4083463b5c
No known key found for this signature in database
GPG Key ID: 141001A1AF77F20B
  1. 4
      scripts/joinmarket-qt.py

4
scripts/joinmarket-qt.py

@ -1479,7 +1479,7 @@ class JMMainWindow(QMainWindow):
title="Wallet created") title="Wallet created")
self.initWallet(seed=self.walletname, restart_cb=self.restartWithMsg) self.initWallet(seed=self.walletname, restart_cb=self.restartWithMsg)
def selectWallet(self, testnet_seed=None): def selectWallet(self, testnet_seed=None, restart_cb=None):
if jm_single().config.get("BLOCKCHAIN", "blockchain_source") != "regtest": if jm_single().config.get("BLOCKCHAIN", "blockchain_source") != "regtest":
current_path = os.path.dirname(os.path.realpath(__file__)) current_path = os.path.dirname(os.path.realpath(__file__))
if os.path.isdir(os.path.join(current_path, 'wallets')): if os.path.isdir(os.path.join(current_path, 'wallets')):
@ -1501,7 +1501,7 @@ class JMMainWindow(QMainWindow):
if not ok: if not ok:
return return
pwd = str(text).strip() pwd = str(text).strip()
decrypted = self.loadWalletFromBlockchain(firstarg[0], pwd, restart_cb=self.restartWithMsg) decrypted = self.loadWalletFromBlockchain(firstarg[0], pwd, restart_cb)
else: else:
if not testnet_seed: if not testnet_seed:
testnet_seed, ok = QInputDialog.getText(self, testnet_seed, ok = QInputDialog.getText(self,

Loading…
Cancel
Save