aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.cpp
diff options
context:
space:
mode:
authorJonas Schnelli <[email protected]>2017-01-16 11:08:00 +0100
committerJonas Schnelli <[email protected]>2017-03-24 10:28:38 +0100
commit9af8f00a7530934d4c9c64eb6c2676ac80b24ace (patch)
tree92a0c26f8aec2ec708ac2135afd1d430814a0c6f /src/wallet/wallet.cpp
parentMake sure ReserveKeyFromKeyPool only hands out internal keys if HD_SPLIT is s... (diff)
downloaddiscoin-9af8f00a7530934d4c9c64eb6c2676ac80b24ace.tar.xz
discoin-9af8f00a7530934d4c9c64eb6c2676ac80b24ace.zip
Make sure we hand out keypool keys if HD_SPLIT is not enabled
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r--src/wallet/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2707567e8..9c5172366 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3001,7 +3001,7 @@ void CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool int
throw std::runtime_error(std::string(__func__) + ": read failed");
if (!HaveKey(tmpKeypool.vchPubKey.GetID()))
throw std::runtime_error(std::string(__func__) + ": unknown key in key pool");
- if (!IsHDEnabled() || (tmpKeypool.fInternal == internal && CanSupportFeature(FEATURE_HD_SPLIT)))
+ if (!IsHDEnabled() || !CanSupportFeature(FEATURE_HD_SPLIT) || tmpKeypool.fInternal == internal)
{
nIndex = id;
keypool = tmpKeypool;