RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: better computation of tray index when adding devices

This commit is contained in:
Peter F. Patel-Schneider 2021-10-11 20:40:57 -04:00
parent b3c3ad02c8
commit 116adf9959
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/solaar/ui/tray.py
View File

@ -359,15 +359,16 @@ def _add_device(device):
receiver_path = device.receiver.path if device.receiver is not None else device.path receiver_path = device.receiver.path if device.receiver is not None else device.path
# not true for wired devices - assert receiver_path # not true for wired devices - assert receiver_path
index = 0 index = None
for idx, (path, _ignore, _ignore, _ignore) in enumerate(_devices_info): for idx, (path, _ignore, _ignore, _ignore) in enumerate(_devices_info):
if path == receiver_path: if path == receiver_path:
# the first entry matching the receiver serial should be for the receiver itself # the first entry matching the receiver serial should be for the receiver itself
index = idx + 1 index = idx + 1
break break
# assert index is not None
if device.receiver: if index is None:
index = len(_devices_info)
elif device.receiver:
# proper ordering (according to device.number) for a receiver's devices # proper ordering (according to device.number) for a receiver's devices
while True: while True:
path, number, _ignore, _ignore = _devices_info[index] path, number, _ignore, _ignore = _devices_info[index]