Merge branch 'spentpertxout' of https://github.com/sipa/bitcoin

2011-04-12 17:27:15 -04:00 · 2011-04-12 17:27:15 -04:00 · d89d456655
commit d89d456655
parent 79706a8e48 c59b6f704c
1 changed files with 2 additions and 0 deletions
--- a/main.cpp
+++ b/main.cpp
@ -958,6 +958,8 @@ void ReacceptWalletTransactions()
                }
                for (int i = 0; i < txindex.vSpent.size(); i++)
                {
+                    if (wtx.IsSpent(i))
+                        continue;
                    if (!txindex.vSpent[i].IsNull() && wtx.vout[i].IsMine())
                    {
                        wtx.MarkSpent(i);