fix bug which caused old devices to not be removed

Author: antheas

src/hhd/controller/virtual/uinput/__init__.py

@@ -13,6 +13,16 @@
 logger = logging.getLogger(__name__)
 
 
+# Monkey patch Uinput device to avoid issues
+# _find_device() may crash when controllers
+# disconnect. We dont use the produced device anyway.
+def _patch(*args, **kwargs):
+    pass
+
+
+UInput._find_device = _patch
+
+
 class UInputDevice(Consumer, Producer):
     def __init__(
         self,
@@ -58,6 +68,7 @@ def open(self) -> Sequence[int]:
     def close(self, exit: bool) -> bool:
         if self.dev:
             self.dev.close()
+        self.dev = None
         self.input = None
         self.fd = None
         return True

src/hhd/device/legion_go/base.py

@@ -182,9 +182,9 @@ def controller_loop_rest(mode: str, pid: int, conf: Config, should_exit: TEvent)
                     logger.info(evs)
                 d_uinput.consume(evs)
     finally:
+        d_uinput.close(True)
         d_shortcuts.close(True)
         d_raw.close(True)
-        d_uinput.close(True)
 
 
 def controller_loop_xinput(conf: Config, should_exit: TEvent):
@@ -311,8 +311,8 @@ def controller_loop_xinput(conf: Config, should_exit: TEvent):
     fd_to_dev = {}
 
     def prepare(m):
-        fs = m.open()
         devs.append(m)
+        fs = m.open()
         fds.extend(fs)
         for f in fs:
             fd_to_dev[f] = m