sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-05 05:46:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add protection to recursive refresh call

Browse source
This commit is contained in:
Craig Raw 2022-03-03 09:44:47 +02:00
parent e594007af1
commit 416fc83b4d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/sparrowwallet/sparrow/whirlpool/dataSource/SparrowDataSource.java
View file

@ -247,12 +247,12 @@ public class SparrowDataSource extends WalletResponseDataSource {
@Subscribe @Subscribe
public void walletHistoryChanged(WalletHistoryChangedEvent event) { public void walletHistoryChanged(WalletHistoryChangedEvent event) {
refreshWallet(event.getWalletId(), event.getWallet()); refreshWallet(event.getWalletId(), event.getWallet(), 0);
} }
@Subscribe @Subscribe
public void walletAddressesChanged(WalletAddressesChangedEvent event) { public void walletAddressesChanged(WalletAddressesChangedEvent event) {
refreshWallet(event.getWalletId(), event.getWallet()); refreshWallet(event.getWalletId(), event.getWallet(), 0);
} }
@Subscribe @Subscribe
@ -264,13 +264,14 @@ public class SparrowDataSource extends WalletResponseDataSource {
} }
} }
private void refreshWallet(String walletId, Wallet wallet) { private void refreshWallet(String walletId, Wallet wallet, int i) {
try { try {
// match <prefix>:master, :Premix, :Postmix // match <prefix>:master, :Premix, :Postmix
if(walletId.startsWith(walletIdentifierPrefix) && (wallet.isWhirlpoolMasterWallet() || wallet.isWhirlpoolChildWallet())) { if(walletId.startsWith(walletIdentifierPrefix) && (wallet.isWhirlpoolMasterWallet() || wallet.isWhirlpoolChildWallet())) {
//Workaround to avoid refreshing the wallet after it has been opened, but before it has been started
Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(wallet); Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(wallet);
if(whirlpool != null && whirlpool.isStarting()) { if(whirlpool != null && whirlpool.isStarting() && i < 1000) {
Platform.runLater(() -> refreshWallet(walletId, wallet)); Platform.runLater(() -> refreshWallet(walletId, wallet, i+1));
} else { } else {
refresh(); refresh();
} }