Browse Source

Merge pull request #293 from tcatm/keypool-fix

create keypool in LoadWallet()
0.8
Gavin Andresen 14 years ago
parent
commit
60152827e3
  1. 11
      src/db.cpp

11
src/db.cpp

@ -845,12 +845,11 @@ bool LoadWallet(bool& fFirstRunRet)
{ {
// Create new keyUser and set as default key // Create new keyUser and set as default key
RandAddSeedPerfmon(); RandAddSeedPerfmon();
keyUser.MakeNewKey();
if (!AddKey(keyUser)) CWalletDB walletdb;
return false; vchDefaultKey = GetKeyFromKeyPool();
if (!SetAddressBookName(PubKeyToAddress(keyUser.GetPubKey()), "")) walletdb.WriteDefaultKey(vchDefaultKey);
return false; walletdb.WriteName(PubKeyToAddress(vchDefaultKey), "");
CWalletDB().WriteDefaultKey(keyUser.GetPubKey());
} }
CreateThread(ThreadFlushWalletDB, NULL); CreateThread(ThreadFlushWalletDB, NULL);

Loading…
Cancel
Save