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

diff --git a/main.cpp b/main.cpp
index 17a1b81..1c2292b 100644 (file)
--- 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);