aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJonas Schnelli <[email protected]>2017-01-16 08:57:31 +0100
committerJonas Schnelli <[email protected]>2017-03-24 10:28:38 +0100
commit01de822c8dbc92d8039dd17de9193d72eb7fadd2 (patch)
tree588fd7bb4dd14cfc30f10ce5aea2f56fb1ad0a65 /src
parentImmediately return setKeyPool's size if HD or HD_SPLIT is disabled or not sup... (diff)
downloaddiscoin-01de822c8dbc92d8039dd17de9193d72eb7fadd2.tar.xz
discoin-01de822c8dbc92d8039dd17de9193d72eb7fadd2.zip
Removed redundant IsLocked() check in NewKeyPool()
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 349dff4f2..15dabad7f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2899,10 +2899,9 @@ bool CWallet::NewKeyPool()
walletdb.ErasePool(nIndex);
setKeyPool.clear();
- if (IsLocked())
+ if (!TopUpKeyPool()) {
return false;
-
- TopUpKeyPool();
+ }
LogPrintf("CWallet::NewKeyPool rewrote keypool\n");
}
return true;