From 8a71e46e9b9940932e1d25b75047ea36f535541c Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Mon, 29 Jan 2018 15:39:46 +0100
Subject: [PATCH] fix conflicting local txns, e.g. when using RBF

---
 lib/wallet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/wallet.py b/lib/wallet.py
index 62b096eda..4f2418fbc 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -607,7 +607,7 @@ class Abstract_Wallet(PrintError):
                 x += v
             elif tx_height > 0:
                 c += v
-            else:
+            elif tx_height != -2:  # local tx
                 u += v
             if txo in sent:
                 if sent[txo] > 0:
@@ -824,7 +824,7 @@ class Abstract_Wallet(PrintError):
             h2.append((tx_hash, height, conf, timestamp, delta, balance))
             if balance is None or delta is None:
                 balance = None
-            else:
+            elif height != -2:  # local tx
                 balance -= delta
         h2.reverse()