Zinc window: skip createAndSetZincContext() when closing OpenCOR.

opencor · Aug 13, 2020 · ee98ba2 · ee98ba2
1 parent 5993f9f
commit ee98ba2
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/plugins/test/ZincWindow/src/zincwindowwindow.cpp b/src/plugins/test/ZincWindow/src/zincwindowwindow.cpp
@@ -91,6 +91,8 @@ ZincWindowWindow::~ZincWindowWindow()
 
     delete mZincContext;
 
+    mZincWidget = nullptr;
+
     // Delete the GUI
 
     delete mGui;
@@ -109,6 +111,13 @@ void ZincWindowWindow::retranslateUi()
 
 void ZincWindowWindow::createAndSetZincContext()
 {
+    // Make sure that we still have a Zinc widget (i.e. skip the case where we
+    // are coming here as a result of closing OpenCOR)
+
+    if (mZincWidget == nullptr) {
+        return;
+    }
+
     // Keep track of our current scene viewer's description
 
     mZincSceneViewerDescription = mZincWidget->sceneViewer().writeDescription();