diff options
| author | Pieter Wuille <[email protected]> | 2012-05-26 10:17:27 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-05-26 10:17:27 -0700 |
| commit | a52c7a1b65b4a10a36e455d9cbc98265fa6736ba (patch) | |
| tree | 874ba6b64820d168d4e2060de75ea81c4c957650 /src/walletdb.cpp | |
| parent | Merge pull request #1370 from Diapolo/add_startuptime_to_log (diff) | |
| parent | Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress (diff) | |
| download | discoin-a52c7a1b65b4a10a36e455d9cbc98265fa6736ba.tar.xz discoin-a52c7a1b65b4a10a36e455d9cbc98265fa6736ba.zip | |
Merge pull request #1357 from sipa/keyid
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 2d44e4982..2c4d4c0ef 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -104,7 +104,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin int CWalletDB::LoadWallet(CWallet* pwallet) { - pwallet->vchDefaultKey.clear(); + pwallet->vchDefaultKey = CPubKey(); int nFileVersion = 0; vector<uint256> vWalletUpgrade; bool fIsEncrypted = false; @@ -151,7 +151,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) { string strAddress; ssKey >> strAddress; - ssValue >> pwallet->mapAddressBook[strAddress]; + ssValue >> pwallet->mapAddressBook[CBitcoinAddress(strAddress).Get()]; } else if (strType == "tx") { |