mirror of
https://github.com/JoinMarket-Org/joinmarket-clientserver.git
synced 2026-08-13 12:33:40 +02:00
Fixes #389 - wallet syncing in Qt
In commit 22467f4 a bug was introduced whereby detailed
sync was used instead of fast sync, but with only one
iteration, in Joinmarket-Qt, in certain circumstances,
leading to incorrect wallet reporting/display. This commit
reverts that change (except for function name change).
There may still be edge cases for large wallets doing
recovery in Qt but this will be dealt with later.
This commit is contained in:
parent
11304c6ab0
commit
bdc0ac57b9
1 changed files with 2 additions and 2 deletions
|
|
@ -1479,7 +1479,7 @@ class JMMainWindow(QMainWindow):
|
|||
title="Wallet created")
|
||||
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":
|
||||
current_path = os.path.dirname(os.path.realpath(__file__))
|
||||
if os.path.isdir(os.path.join(current_path, 'wallets')):
|
||||
|
|
@ -1501,7 +1501,7 @@ class JMMainWindow(QMainWindow):
|
|||
if not ok:
|
||||
return
|
||||
pwd = str(text).strip()
|
||||
decrypted = self.loadWalletFromBlockchain(firstarg[0], pwd, restart_cb=self.restartWithMsg)
|
||||
decrypted = self.loadWalletFromBlockchain(firstarg[0], pwd, restart_cb)
|
||||
else:
|
||||
if not testnet_seed:
|
||||
testnet_seed, ok = QInputDialog.getText(self,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue