tfix get_history - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit da502076bd4600c712fd5f8a0ba7533619b4a72c
DIR parent f051a3e5779793619bdbd2feff73abd3a0cc1e55
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 30 Mar 2015 20:39:06 +0200
fix get_history
Diffstat:
M lib/wallet.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -738,7 +738,7 @@ class Abstract_Wallet(object):
merged[tx_hash] = (height, delta)
else:
h, d = merged.get(tx_hash)
- merged[tx_hash] = (h, d + delta)
+ merged[tx_hash] = (h, d + delta if (d is not None and delta is not None) else None)
# 3. create sorted list
history = []