aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-08-12 16:32:07 -0400
committerGavin Andresen <gavinandresen@gmail.com>2011-09-01 10:12:59 -0400
commit7db3b75b3e38c2088596f49cb51fe1c9c7e8b433 (patch)
tree9484ca192506ab645ca1764d5993bd6ddce88b44 /src/main.cpp
parentf662cefd8552f07548dcca9dcf84a952650fab6f (diff)
downloadbitcoin-7db3b75b3e38c2088596f49cb51fe1c9c7e8b433.tar.xz
Logic running with -keypool=0 was wrong (empty keys were being returned). Fixes #445
Renames GetOrReuseKeyFromKeyPool to GetKeyFromPool, with fAllowReuse arg and bool result.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 36fdaa72fd..203b8d5f98 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2183,7 +2183,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// Keep giving the same key to the same ip until they use it
if (!mapReuseKey.count(pfrom->addr.ip))
- mapReuseKey[pfrom->addr.ip] = pwalletMain->GetOrReuseKeyFromPool();
+ pwalletMain->GetKeyFromPool(mapReuseKey[pfrom->addr.ip], true);
// Send back approval of order and pubkey to use
CScript scriptPubKey;