diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-02-18 15:23:24 +0100 |
|---|---|---|
| committer | langerhans <[email protected]> | 2014-05-29 19:52:30 +0200 |
| commit | 52861fb6162b7055b258bee3346193c61d274d3d (patch) | |
| tree | af35273afa14b82a63c440441aacb89fb028db28 /src/walletdb.cpp | |
| parent | chainActive locking issues resolved (diff) | |
| download | discoin-52861fb6162b7055b258bee3346193c61d274d3d.tar.xz discoin-52861fb6162b7055b258bee3346193c61d274d3d.zip | |
AddToWallet implies BindWallet
Now that AddToWallet is called when loading transactions from the
wallet database, BindWallet can be integrated into that and does not
need to be an extra step.
Leaves behaviour unchanged, but makes the
fFromLoadWallet/!fFromLoadWallet paths in AddToWallet a bit more
symmetric.
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index d7991634b..d5f4ea733 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -352,9 +352,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, CWalletTx wtx; ssValue >> wtx; CValidationState state; - if (CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid()) - wtx.BindWallet(pwallet); - else + if (!(CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid())) return false; if (wtx.nOrderPos == -1) |