Merge pull request #3701

laanwj · laanwj · commit 913e90db9ad9 · 2014-04-19T08:51:40.000+02:00
09ec3af AddToWallet implies BindWallet (Wladimir J. van der Laan)
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -471,6 +471,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet)
     if (fFromLoadWallet)
     {
         mapWallet[hash] = wtxIn;
+        mapWallet[hash].BindWallet(this);
         AddToSpends(hash);
     }
     else
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -471,6 +471,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet)`
`471`	`471`	`if (fFromLoadWallet)`
`472`	`472`	`{`
`473`	`473`	`mapWallet[hash] = wtxIn;`
	`474`	`+ mapWallet[hash].BindWallet(this);`
`474`	`475`	`AddToSpends(hash);`
`475`	`476`	`}`
`476`	`477`	`else`