Merge branch 'claude/frame-timing-harness' into claude/offscreen-rendering

# Conflicts:
#	src/display_manager.py
This commit is contained in:
Chuck
2026-09-24 18:58:58 -04:00
+3 -2
View File
@@ -1439,8 +1439,6 @@ class DisplayManager:
"""Clean up resources.""" """Clean up resources."""
if hasattr(self, '_snapshot_cond'): if hasattr(self, '_snapshot_cond'):
self._stop_snapshot_writer() self._stop_snapshot_writer()
if getattr(self, 'frame_timing', None) is not None:
self.frame_timing.close()
if hasattr(self, 'matrix') and self.matrix is not None: if hasattr(self, 'matrix') and self.matrix is not None:
try: try:
self.matrix.Clear() self.matrix.Clear()
@@ -1452,6 +1450,9 @@ class DisplayManager:
self._new_canvas(self.width, self.height) self._new_canvas(self.width, self.height)
except (OSError, RuntimeError, ValueError, MemoryError): except (OSError, RuntimeError, ValueError, MemoryError):
logger.debug("Canvas reset during cleanup failed", exc_info=True) logger.debug("Canvas reset during cleanup failed", exc_info=True)
# The stall watchdog would otherwise outlive this manager.
if getattr(self, 'frame_timing', None) is not None:
self.frame_timing.close()
# Reset the singleton state when cleaning up # Reset the singleton state when cleaning up
DisplayManager._instance = None DisplayManager._instance = None