Browse Source
Merge pull request #3326 from SomberNight/ledger_clear_dialog
fix: ledger clear_dialog() threading issues
3.0.x
ThomasV
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
5 deletions
-
plugins/ledger/ledger.py
|
|
|
@ -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] |
|
|
|
@ -376,7 +376,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() |
|
|
|
@ -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() |
|
|
|
@ -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] |
|
|
|
|
