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

device: fix exception when removing device not in instance list

This commit is contained in:
Peter F. Patel-Schneider 2022-08-14 13:08:52 -04:00
parent 4a970b5b2e
commit 58dde18f3c
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/logitech_receiver/device.py
View File

@ -35,7 +35,7 @@ class Device:
def __init__(self, receiver, number, link_notification=None, info=None, path=None, handle=None): def __init__(self, receiver, number, link_notification=None, info=None, path=None, handle=None):
assert receiver or info assert receiver or info
self.instances.append(self) Device.instances.append(self)
self.receiver = receiver self.receiver = receiver
self.may_unpair = False self.may_unpair = False
self.isDevice = True # some devices act as receiver so we need a property to distinguish them self.isDevice = True # some devices act as receiver so we need a property to distinguish them
@ -163,7 +163,7 @@ class Device:
def find(self, serial): def find(self, serial):
assert serial, 'need serial number or unit ID to find a device' assert serial, 'need serial number or unit ID to find a device'
result = None result = None
for device in self.instances: for device in Device.instances:
if device.online and (device.unitId == serial or device.serial == serial): if device.online and (device.unitId == serial or device.serial == serial):
result = device result = device
return result return result
@ -490,7 +490,8 @@ class Device:
def close(self): def close(self):
handle, self.handle = self.handle, None handle, self.handle = self.handle, None
self.instances.remove(self) if self in Device.instances:
Device.instances.remove(self)
return (handle and _base.close(handle)) return (handle and _base.close(handle))
def __del__(self): def __del__(self):