Merge pull request #409 from TheBlueMatt/master
Fix crashes when a wallet is locked and GetReservedKey() is called
This commit is contained in:
commit
60d2f8662c
|
@ -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…
Reference in New Issue