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

fix npe showing the mix to dialog when non-standard wallets are loaded

Browse source
This commit is contained in:
Craig Raw 2021-09-27 10:08:48 +02:00
parent 761e9c9b7e
commit 86a49e0d9a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
View file

@ -45,7 +45,7 @@ public class MixToController implements Initializable {
List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid() List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid()
&& openWallet != wallet && openWallet != wallet.getMasterWallet() && openWallet != wallet && openWallet != wallet.getMasterWallet()
&& !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType())).collect(Collectors.toList()); && (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList());
allWallets.addAll(destinationWallets); allWallets.addAll(destinationWallets);
mixToWallets.setItems(FXCollections.observableList(allWallets)); mixToWallets.setItems(FXCollections.observableList(allWallets));