From 9af8f00a7530934d4c9c64eb6c2676ac80b24ace Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Mon, 16 Jan 2017 11:08:00 +0100 Subject: [PATCH] Make sure we hand out keypool keys if HD_SPLIT is not enabled --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;