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

fix npe for new wallets

Browse source
This commit is contained in:
Craig Raw 2021-08-16 10:45:48 +02:00
parent eab42c0f05
commit 2eedd2290c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/sparrowwallet/drongo/wallet/Wallet.java
View file

@ -143,9 +143,11 @@ public class Wallet extends Persistable {
int index = -1;
for(Keystore keystore : getKeystores()) {
int keystoreAccount = getScriptType().getAccount(keystore.getKeyDerivation().getDerivationPath());
if(keystoreAccount != -1 && (index == -1 || keystoreAccount == index)) {
index = keystoreAccount;
if(keystore.getKeyDerivation() != null) {
int keystoreAccount = getScriptType().getAccount(keystore.getKeyDerivation().getDerivationPath());
if(keystoreAccount != -1 && (index == -1 || keystoreAccount == index)) {
index = keystoreAccount;
}
}
}