fix hidden window property browser crash issue

narunlifescience · Apr 17, 2024 · 4ae519e · 4ae519e
1 parent 78859ad
commit 4ae519e
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 3 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/3rdparty/.DS_Store b/3rdparty/.DS_Store
diff --git a/alphaplot/.DS_Store b/alphaplot/.DS_Store
diff --git a/alphaplot/src/.DS_Store b/alphaplot/src/.DS_Store
diff --git a/alphaplot/src/ApplicationWindow.cpp b/alphaplot/src/ApplicationWindow.cpp
@@ -5557,6 +5557,9 @@ void ApplicationWindow::hideActiveWindow() {
 void ApplicationWindow::hideWindow(MyWidget *w) {
   hiddenWindows.append(w);
   w->setHidden();
+  propertybrowser->populateObjectBrowser(nullptr);
+  customMenu(nullptr);
+  customToolBars(nullptr);
   emit modified();
 }
 
@@ -5573,7 +5576,7 @@ void ApplicationWindow::activateWindow() {
   raise();
   show();
   WindowTableWidgetItem *it =
-      static_cast<WindowTableWidgetItem *>(ui_->listView->currentItem());
+      dynamic_cast<WindowTableWidgetItem *>(ui_->listView->currentItem());
   if (it) activateWindow(it->window());
 }
 
@@ -5638,6 +5641,7 @@ void ApplicationWindow::removeWindowFromLists(MyWidget *widgrt) {
   QString caption = widgrt->name();
   if (isActiveSubwindow(SubWindowType::TableSubWindow)) {
     Table *table = qobject_cast<Table *>(widgrt);
+    if(!table) return;
     for (int i = 0; i < table->numCols(); i++) {
       QString name = table->colName(i);
       removeCurves(table, name);
@@ -5681,9 +5685,9 @@ void ApplicationWindow::closeWindow(MyWidget *window) {
   if (subwindowlist.isEmpty()) {
     customMenu(nullptr);
     customToolBars(nullptr);
-    propertybrowser->populateObjectBrowser(nullptr);
   }
 
+  propertybrowser->populateObjectBrowser(nullptr);
   emit modified();
 }
 

diff --git a/alphaplot/src/core/propertybrowser/propertybrowser.cpp b/alphaplot/src/core/propertybrowser/propertybrowser.cpp
@@ -114,7 +114,7 @@ void PropertyBrowser::populateObjectBrowser(MyWidget *widget) {
   } else if (qobject_cast<Layout2D *>(widget)) {
     Layout2D *gd = qobject_cast<Layout2D *>(widget);
     objectItemModel_->buildUpGraph2D(gd);
-    connect(gd, &Layout2D::addedOrRemoved, this, [=]() {
+    connect(gd, &Layout2D::addedOrRemoved, this, [&]() {
       MyWidget *active =
           qobject_cast<MyWidget *>(app_->d_workspace->activeSubWindow());
       if (active == widget) {

diff --git a/build/.DS_Store b/build/.DS_Store
diff --git a/data/.DS_Store b/data/.DS_Store
diff --git a/fitPlugins/.DS_Store b/fitPlugins/.DS_Store