tMerge pull request #3326 from SomberNight/ledger_clear_dialog - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 43181aea0677fa5ba1c0af69e88d33588e839423
DIR parent 219a5b02a63a9ee227cff1c83516d003736abf4b
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 18 Nov 2017 11:39:46 +0100
Merge pull request #3326 from SomberNight/ledger_clear_dialog
fix: ledger clear_dialog() threading issues
Diffstat:
M plugins/ledger/ledger.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
t@@ -238,7 +238,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
except Exception as e:
self.give_error(e, True)
finally:
- self.handler.clear_dialog()
+ self.handler.finished()
self.signing = False
# Parse the ASN.1 signature
rLength = signature[3]
t@@ -376,13 +376,13 @@ class Ledger_KeyStore(Hardware_KeyStore):
transactionOutput = outputData['outputData']
if outputData['confirmationNeeded']:
outputData['address'] = output
- self.handler.clear_dialog()
+ self.handler.finished()
pin = self.handler.get_auth( outputData ) # does the authenticate dialog and returns pin
if not pin:
raise UserWarning()
if pin != 'paired':
self.handler.show_message(_("Confirmed. Signing Transaction..."))
- while inputIndex < len(inputs):
+ while inputIndex < len(inputs):
singleInput = [ chipInputs[inputIndex] ]
self.get_client().startUntrustedTransaction(False, 0,
singleInput, redeemScripts[inputIndex])
t@@ -400,7 +400,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
transactionOutput = outputData['outputData']
if outputData['confirmationNeeded']:
outputData['address'] = output
- self.handler.clear_dialog()
+ self.handler.finished()
pin = self.handler.get_auth( outputData ) # does the authenticate dialog and returns pin
if not pin:
raise UserWarning()
t@@ -421,7 +421,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
traceback.print_exc(file=sys.stdout)
self.give_error(e, True)
finally:
- self.handler.clear_dialog()
+ self.handler.finished()
for i, txin in enumerate(tx.inputs()):
signingPos = inputs[i][4]