From 652bf2d00b0cb4122ecd18dbaf05ac5aaa2ce63e Mon Sep 17 00:00:00 2001
From: wyzula-jan <jan.wyzula@psi.ch>
Date: Sun, 26 Oct 2025 20:00:00 +0100
Subject: [PATCH] fix(main_window): cleanup adjusted with shiboken6

---
 bec_widgets/widgets/containers/main_window/main_window.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bec_widgets/widgets/containers/main_window/main_window.py b/bec_widgets/widgets/containers/main_window/main_window.py
index 78719e08..16f8dfe3 100644
--- a/bec_widgets/widgets/containers/main_window/main_window.py
+++ b/bec_widgets/widgets/containers/main_window/main_window.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import os
 
+import shiboken6
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import QEasingCurve, QEvent, QPropertyAnimation, QSize, Qt, QTimer
 from qtpy.QtGui import QAction, QActionGroup, QIcon
@@ -468,9 +469,9 @@ class BECMainWindow(BECWidget, QMainWindow):
             for child in children:
                 ancestor = WidgetHierarchy._get_becwidget_ancestor(child)
                 if ancestor is self:
-                    child.cleanup()
-                    child.close()
-                    child.deleteLater()
+                    if shiboken6.isValid(child):
+                        child.close()
+                        child.deleteLater()
 
         # Timer cleanup
         if hasattr(self, "_client_info_expire_timer") and self._client_info_expire_timer.isActive():