LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 01:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hww: select_device: only update label/dev_id after pairing succeeds

Browse source
This commit is contained in:
SomberNight 2020-04-08 16:50:55 +02:00
parent 4ef313a1ac
commit e1996bde01
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
electrum/plugin.py
View file

@ -485,6 +485,7 @@ class DeviceMgr(ThreadJob):
if client: if client:
handler.update_status(True) handler.update_status(True)
if client: if client:
# note: if select_device was called, we might also update label etc here:
keystore.opportunistically_fill_in_missing_info_from_device(client) keystore.opportunistically_fill_in_missing_info_from_device(client)
self.logger.info("end client for keystore") self.logger.info("end client for keystore")
return client return client
@ -621,12 +622,7 @@ class DeviceMgr(ThreadJob):
if c is None: if c is None:
raise UserCancelled() raise UserCancelled()
info = infos[c] info = infos[c]
# save new label / soft_device_id # note: updated label/soft_device_id will be saved after pairing succeeds
keystore.set_label(info.label)
keystore.soft_device_id = info.soft_device_id
wallet = handler.get_wallet()
if wallet is not None:
wallet.save_keystore()
return info return info
@with_scan_lock @with_scan_lock