Call deleteLater for GraphicsViews when unloading a class (#6975)

OpenModelica · Nov 23, 2020 · 637d5ad · 637d5ad
1 parent 0b558b5
commit 637d5ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/OMEdit/OMEditLIB/Element/Element.cpp b/OMEdit/OMEditLIB/Element/Element.cpp
@@ -2733,13 +2733,6 @@ void Element::referenceElementChanged()
  */
 void Element::referenceElementDeleted()
 {
-#ifdef QT_NO_DEBUG
-  // sanity check to avoid crashes just in release mode
-  if (!(mpGraphicsView && mpGraphicsView->getModelWidget() && mpGraphicsView->getModelWidget()->getLibraryTreeItem())) {
-    return;
-  }
-#endif // #ifdef QT_NO_DEBUG
-
   if (mElementType == Element::Port) {
     setVisible(false);
     if (mpReferenceComponent && mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS) {

diff --git a/OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp
@@ -2919,6 +2919,14 @@ void LibraryTreeModel::unloadClassHelper(LibraryTreeItem *pLibraryTreeItem, Libr
       pMdiSubWindow->deleteLater();
     }
     pLibraryTreeItem->getModelWidget()->clearGraphicsViews();
+    if (pLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()) {
+      pLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()->deleteLater();
+      pLibraryTreeItem->getModelWidget()->setDiagramGraphicsView(0);
+    }
+    if (pLibraryTreeItem->getModelWidget()->getIconGraphicsView()) {
+      pLibraryTreeItem->getModelWidget()->getIconGraphicsView()->deleteLater();
+      pLibraryTreeItem->getModelWidget()->setIconGraphicsView(0);
+    }
     // if ModelWidget is used by DiagramWindow
     if (MainWindow::instance()->getPlotWindowContainer()->getDiagramSubWindowFromMdi()) {
       MainWindow::instance()->getPlotWindowContainer()->getDiagramWindow()->removeDiagram(pLibraryTreeItem->getModelWidget());

diff --git a/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.h b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.h
@@ -509,7 +509,9 @@ class ModelWidget : public QWidget
   QToolButton* getDiagramViewToolButton() {return mpDiagramViewToolButton;}
   QToolButton* getTextViewToolButton() {return mpTextViewToolButton;}
   QToolButton* getDocumentationViewToolButton() {return mpDocumentationViewToolButton;}
+  void setDiagramGraphicsView(GraphicsView *pDiagramGraphicsView) {mpDiagramGraphicsView = pDiagramGraphicsView;}
   GraphicsView* getDiagramGraphicsView() {return mpDiagramGraphicsView;}
+  void setIconGraphicsView(GraphicsView *pIconGraphicsView) {mpIconGraphicsView = pIconGraphicsView;}
   GraphicsView* getIconGraphicsView() {return mpIconGraphicsView;}
   UndoStack* getUndoStack() {return mpUndoStack;}
   BaseEditor* getEditor() {return mpEditor;}