fix get_history

2015-03-30 20:39:06 +02:00 · 2015-03-30 20:39:06 +02:00 · da502076bd
parent f051a3e577
commit da502076bd
1 changed files with 1 additions and 1 deletions
--- a/lib/wallet.py
+++ b/lib/wallet.py
@ -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 = []