Browse Source

Merge pull request #409 from TheBlueMatt/master

Fix crashes when a wallet is locked and GetReservedKey() is called
0.8
Jeff Garzik 14 years ago
parent
commit
60d2f8662c
  1. 3
      src/wallet.cpp

3
src/wallet.cpp

@ -1320,7 +1320,10 @@ vector<unsigned char> CReserveKey::GetReservedKey()
{ {
CKeyPool keypool; CKeyPool keypool;
pwallet->ReserveKeyFromKeyPool(nIndex, keypool); pwallet->ReserveKeyFromKeyPool(nIndex, keypool);
if (nIndex != -1)
vchPubKey = keypool.vchPubKey; vchPubKey = keypool.vchPubKey;
else
vchPubKey = vchDefaultKey;
} }
assert(!vchPubKey.empty()); assert(!vchPubKey.empty());
return vchPubKey; return vchPubKey;

Loading…
Cancel
Save