Final batch of code stability updates before anouther bout of extended testing. Still plenty to go, but making progress.

src/fenrirscreenreader/core/commandManager.py

@@ -84,11 +84,9 @@ class commandManager():
                 fileName = fileName.split('/')[-1]
                 if fileName.startswith('__'):
                     continue
-                try:
-                    if self.env['commands'][section][fileName.upper()] != None:
-                        continue
-                except Exception as e:
-                    pass
+                # Check if command already exists to prevent duplicate loading
+                if fileName.upper() in self.env['commands'][section] and self.env['commands'][section][fileName.upper()] is not None:
+                    continue
                 if fileExtension.lower() == '.py':
                     command_mod = module_utils.importModule(fileName, command)
                     self.env['commands'][section][fileName.upper()] = command_mod.command()

src/fenrirscreenreader/core/eventManager.py

@@ -15,7 +15,7 @@ from ctypes import c_bool
 class eventManager():
     def __init__(self):
         self.running =  Value(c_bool, True)
-        self._eventQueue = Queue() # multiprocessing.Queue()
+        self._eventQueue = Queue(maxsize=100) # Bounded queue to prevent memory exhaustion
         self.cleanEventQueue()
     def initialize(self, environment):
         self.env = environment
@@ -85,8 +85,16 @@ class eventManager():
             return False
         if event == fenrirEventType.Ignore:
             return False
-        if self.getEventQueueSize() > 50:
-            if not event in [fenrirEventType.ScreenUpdate, fenrirEventType.HeartBeat]:
-                self.cleanEventQueue()
-        self._eventQueue.put({"Type":event,"Data":data})
+        # Use bounded queue - if full, this will block briefly or drop older events
+        try:
+            self._eventQueue.put({"Type":event,"Data":data}, timeout=0.1)
+        except Exception as e:
+            # Queue full - drop oldest event and add new one for critical events
+            if event in [fenrirEventType.ScreenUpdate, fenrirEventType.KeyboardInput]:
+                try:
+                    self._eventQueue.get_nowait()  # Remove oldest
+                    self._eventQueue.put({"Type":event,"Data":data}, timeout=0.1)
+                except:
+                    pass  # If still can't add, drop the event
+            # For non-critical events, just drop them if queue is full
         return True

src/fenrirscreenreader/core/memoryManager.py

@@ -30,11 +30,12 @@ class memoryManager():
         if not self.listStorageValid(name):
             return
         if self.listStorage[name]['maxLength'] == None:
-            self.listStorage[name]['list'] = [value] + self.listStorage[name]['list']
+            # Fallback: if maxLength is still None, apply default limit of 1000
+            self.listStorage[name]['list'] = [value] + self.listStorage[name]['list'][:999]
         else:        
             self.listStorage[name]['list'] = [value] + self.listStorage[name]['list'][:self.listStorage[name]['maxLength'] -1]
         self.listStorage[name]['index'] = 0
-    def addIndexList(self, name, maxLength = None, currList = [], currIndex = -1):
+    def addIndexList(self, name, maxLength = 1000, currList = [], currIndex = -1):
         if len(currList) != 0 and (currIndex == -1):
             currIndex = 0
         self.listStorage[name] = {'list': currList, 'index': currIndex, 'maxLength': maxLength}

src/fenrirscreenreader/core/processManager.py

@@ -29,9 +29,9 @@ class processManager():
             #    pass
             #except:
             #    pass
-            proc.join()
+            proc.join(timeout=5.0)  # Timeout to prevent hanging shutdown
         for t in self._Threads:
-            t.join()
+            t.join(timeout=5.0)  # Timeout to prevent hanging shutdown
     def heartBeatTimer(self, active):
         try:
             time.sleep(0.5)