diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-15 08:56:55 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-15 08:56:55 -0500 |
| commit | 085c62149ad19cecf235829e49df07884a279e1e (patch) | |
| tree | 4106ba96196e883464f5891ef88be34514c67cb9 /src/walletdb.cpp | |
| parent | 05d3ded072d782036c31c1d773c0441b87de843e (diff) | |
| parent | 731b89b8b53cb2ea4d2d5c8f2875def515766ea1 (diff) | |
| download | bitcoin-085c62149ad19cecf235829e49df07884a279e1e.tar.xz | |
Merge pull request #3671 from gavinandresen/txn_conflicts
Report transaction conflicts, and tentative account balance fix
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index b3cc9a2350..2f8c827bc2 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -382,7 +382,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, if (wtx.nOrderPos == -1) wss.fAnyUnordered = true; - pwallet->mapWallet[hash] = wtx; + pwallet->AddToWallet(wtx, true); //// debug print //LogPrintf("LoadWallet %s\n", wtx.GetHash().ToString()); //LogPrintf(" %12"PRId64" %s %s %s\n", |