diff --git a/drongo b/drongo index eab42c0f..2eedd229 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit eab42c0f0580452968f579bba3904bfc6480ae0f +Subproject commit 2eedd2290cbe1dd559247f1ee934cece81fa7419 diff --git a/src/main/java/com/sparrowwallet/sparrow/AppServices.java b/src/main/java/com/sparrowwallet/sparrow/AppServices.java index 0f2bbee5..f7ce3089 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppServices.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppServices.java @@ -898,7 +898,7 @@ public class AppServices { Platform.runLater(() -> { if(!Window.getWindows().isEmpty()) { - List walletFiles = allWallets.stream().filter(walletTabData -> walletTabData.getWallet().getMasterWallet() == null).map(walletTabData -> walletTabData.getStorage().getWalletFile()).collect(Collectors.toList()); + List walletFiles = allWallets.stream().filter(walletTabData -> walletTabData.getWallet().getMasterWallet() == null).map(walletTabData -> walletTabData.getStorage().getWalletFile()).filter(File::exists).collect(Collectors.toList()); Config.get().setRecentWalletFiles(Config.get().isLoadRecentWallets() ? walletFiles : Collections.emptyList()); } }); diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java index d8aa5e6d..3909ef18 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java @@ -142,6 +142,11 @@ public class SettingsController extends WalletFormController implements Initiali multisigControl.lowValueProperty().addListener((observable, oldValue, threshold) -> { EventManager.get().post(new SettingsChangedEvent(walletForm.getWallet(), SettingsChangedEvent.Type.MUTLISIG_THRESHOLD)); }); + multisigControl.highValueProperty().addListener((observable, oldValue, newValue) -> { + if(newValue.doubleValue() == multisigControl.getMax() && newValue.doubleValue() <= 49.0) { + multisigControl.setMax(newValue.doubleValue() + 1.0); + } + }); multisigFieldset.managedProperty().bind(multisigFieldset.visibleProperty()); @@ -223,6 +228,7 @@ public class SettingsController extends WalletFormController implements Initiali if(wallet.getPolicyType().equals(PolicyType.SINGLE)) { totalKeystores.setValue(1); } else if(wallet.getPolicyType().equals(PolicyType.MULTI)) { + multisigControl.setMax(Math.max(multisigControl.getMax(), wallet.getKeystores().size())); multisigControl.lowValueProperty().set(wallet.getDefaultPolicy().getNumSignaturesRequired()); multisigControl.highValueProperty().set(wallet.getKeystores().size()); totalKeystores.bind(multisigControl.highValueProperty());