diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-04-19 08:51:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-04-19 08:51:40 +0200 |
| commit | 913e90db9ad9d083e4f851e5e3f1139ff5524309 (patch) | |
| tree | f8bc2628286781f3db1fa3d550042e717e7fc1b3 /src/walletdb.cpp | |
| parent | Merge pull request #4037 from gmaxwell/fdleaks (diff) | |
| parent | AddToWallet implies BindWallet (diff) | |
| download | discoin-913e90db9ad9d083e4f851e5e3f1139ff5524309.tar.xz discoin-913e90db9ad9d083e4f851e5e3f1139ff5524309.zip | |
Merge pull request #3701
09ec3af AddToWallet implies BindWallet (Wladimir J. van der Laan)
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 b57ea0b51..359a1cef6 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; // Undo serialize changes in 31600 |