tfix #802 - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 8314efdfd5c0138184dd8a8cb86d56f00ae7e6dd DIR parent d70c9d1ab71523f7ffb4d0644d7621ff5af83e91 HTML Author: ThomasV <thomasv@gitorious> Date: Thu, 2 Apr 2015 18:01:31 +0200 fix #802 Diffstat: M scripts/merchant/merchant.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- DIR diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py t@@ -89,7 +89,7 @@ def on_wallet_update(): if not tx: continue if wallet.verifier.get_confirmations(tx_hash) < requested_confs: continue for o in tx.outputs: - o_address, o_value = o + o_type, o_address, o_value = o if o_address == addr: value += o_value