Merge d5d62a4 into 4b3735b

LeonarddeR · web-flow · commit f20eeaaae370 · 2023-02-16T16:44:51.000+10:00
diff --git a/source/bdDetect.py b/source/bdDetect.py
@@ -359,7 +359,7 @@ def _bgScanBluetooth(
 		"""
 		if not bluetooth:
 			return
-		btDevs: Optional[Iterable[Tuple[str, DeviceMatch]]] = _DeviceInfoFetcher.btDevsCache
+		btDevs: Optional[Iterable[Tuple[str, DeviceMatch]]] = deviceInfoFetcher.btDevsCache
 		if btDevs is None:
 			btDevs = getDriversForPossibleBluetoothDevices()
 			# Cache Bluetooth devices for next time.
@@ -373,7 +373,7 @@ def _bgScanBluetooth(
 				btDevsCache.append((driver, match))
 			yield (driver, match)
 		if btDevsCache is not btDevs:
-			_DeviceInfoFetcher.btDevsCache = btDevsCache
+			deviceInfoFetcher.btDevsCache = btDevsCache
 
 	def _bgScan(
 			self,
@@ -420,7 +420,7 @@ def rescan(
 		"""
 		self._stopBgScan()
 		# Clear the cache of bluetooth devices so new devices can be picked up.
-		_DeviceInfoFetcher.btDevsCache = None
+		deviceInfoFetcher.btDevsCache = None
 		self._queueBgScan(usb=usb, bluetooth=bluetooth, limitToDevices=limitToDevices)
 
 	def handleWindowMessage(self, msg=None, wParam=None):
@@ -433,7 +433,7 @@ def pollBluetoothDevices(self):
 		if not self._detectBluetooth:
 			# Do not poll bluetooth devices at all when bluetooth is disabled.
 			return
-		if not _DeviceInfoFetcher.btDevsCache:
+		if not deviceInfoFetcher.btDevsCache:
 			return
 		self._queueBgScan(bluetooth=self._detectBluetooth, limitToDevices=self._limitToDevices)
 
@@ -442,7 +442,7 @@ def terminate(self):
 		messageWindow.pre_handleWindowMessage.unregister(self.handleWindowMessage)
 		self._stopBgScan()
 		# Clear the cache of bluetooth devices so new devices can be picked up with a new instance.
-		_DeviceInfoFetcher.btDevsCache = None
+		deviceInfoFetcher.btDevsCache = None
 		self._executor.shutdown(wait=False)
 
 
