diff options
| author | Gavin Andresen <[email protected]> | 2011-09-01 12:01:29 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2011-09-01 12:01:29 -0700 |
| commit | 783c636c73182731ca12e6af67516767a989da66 (patch) | |
| tree | 6e160958804c3f0b968a295b3bec7d2ed947b220 /src/main.cpp | |
| parent | Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin (diff) | |
| parent | obtain cs_wallet mutex to protect vchDefaultKey (diff) | |
| download | discoin-783c636c73182731ca12e6af67516767a989da66.tar.xz discoin-783c636c73182731ca12e6af67516767a989da66.zip | |
Merge pull request #467 from gavinandresen/keypoolzero
Logic running with -keypool=0 was wrong (empty keys were being returned).
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index d6bfc63c3..f68683e24 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; |