diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-01-16 11:08:00 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-24 10:28:38 +0100 |
| commit | 9af8f00a7530934d4c9c64eb6c2676ac80b24ace (patch) | |
| tree | 92a0c26f8aec2ec708ac2135afd1d430814a0c6f /src/wallet | |
| parent | 469a47b7601bddeba052415efe95d0e8b0a7b05e (diff) | |
| download | bitcoin-9af8f00a7530934d4c9c64eb6c2676ac80b24ace.tar.xz | |
Make sure we hand out keypool keys if HD_SPLIT is not enabled
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 2707567e82..9c51723664 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; |