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
1 file changed
+4
-1
+4
-1
@@ -1320,7 +1320,10 @@ vector<unsigned char> CReserveKey::GetReservedKey()
|
||||
{
|
||||
CKeyPool keypool;
|
||||
pwallet->ReserveKeyFromKeyPool(nIndex, keypool);
|
||||
vchPubKey = keypool.vchPubKey;
|
||||
if (nIndex != -1)
|
||||
vchPubKey = keypool.vchPubKey;
|
||||
else
|
||||
vchPubKey = vchDefaultKey;
|
||||
}
|
||||
assert(!vchPubKey.empty());
|
||||
return vchPubKey;
|
||||
|
||||
Reference in new issue
Block a user