Merge pull request #3669 from gavinandresen/dead_txns

Handle "conflicted" transactions properly

1 files changed, 8 insertions, 2 deletions

diff --git a/src/wallet.h b/src/wallet.h
index a8f1a81b3c..dc709632b4 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -701,8 +701,11 @@ public:
         // Quick answer in most cases
         if (!IsFinalTx(*this))
             return false;
-        if (GetDepthInMainChain() >= 1)
+        int nDepth = GetDepthInMainChain();
+        if (nDepth >= 1)
             return true;
+        if (nDepth < 0)
+            return false;
         if (!bSpendZeroConfChange || !IsFromMe()) // using wtx's cached debit
             return false;
 
@@ -718,8 +721,11 @@ public:
 
             if (!IsFinalTx(*ptx))
                 return false;
-            if (ptx->GetDepthInMainChain() >= 1)
+            int nPDepth = ptx->GetDepthInMainChain();
+            if (nPDepth >= 1)
                 continue;
+            if (nPDepth < 0)
+                return false;
             if (!pwallet->IsFromMe(*ptx))
                 return false;