3100: use deferred deletion for flags editor checkboxes (TrenchBroom#…

…3108) Fixes TrenchBroom#3100
Danimaltl · Apr 20, 2020 · 67941e2 · 67941e2
1 parent b257087
commit 67941e2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/common/src/View/FlagsEditor.cpp b/common/src/View/FlagsEditor.cpp
@@ -57,7 +57,7 @@ namespace TrenchBroom {
             m_checkBoxes.resize(count, nullptr);
             m_values.resize(count, 0);
 
-            deleteChildWidgetsAndLayout(this);
+            deleteChildWidgetsLaterAndDeleteLayout(this);
 
             auto* layout = new QGridLayout();
             layout->setHorizontalSpacing(LayoutConstants::WideHMargin);

diff --git a/common/src/View/QtUtils.cpp b/common/src/View/QtUtils.cpp
@@ -402,8 +402,11 @@ namespace TrenchBroom {
             tableView->resizeRowsToContents();
         }
 
-        void deleteChildWidgetsAndLayout(QWidget* widget) {
-            qDeleteAll(widget->findChildren<QWidget*>("", Qt::FindDirectChildrenOnly));
+        void deleteChildWidgetsLaterAndDeleteLayout(QWidget* widget) {
+            const QList<QWidget*> children = widget->findChildren<QWidget*>("", Qt::FindDirectChildrenOnly);
+            for (QWidget* childWidget : children) {
+                childWidget->deleteLater();
+            }
 
             delete widget->layout();
         }

diff --git a/common/src/View/QtUtils.h b/common/src/View/QtUtils.h
@@ -191,7 +191,7 @@ namespace TrenchBroom {
         };
 
         void autoResizeRows(QTableView* tableView);
-        void deleteChildWidgetsAndLayout(QWidget* widget);
+        void deleteChildWidgetsLaterAndDeleteLayout(QWidget* widget);
 
         void showModelessDialog(QDialog* dialog);
     }

diff --git a/common/src/View/TextureCollectionEditor.cpp b/common/src/View/TextureCollectionEditor.cpp
@@ -52,7 +52,7 @@ namespace TrenchBroom {
         }
 
         void TextureCollectionEditor::createGui() {
-            deleteChildWidgetsAndLayout(this);
+            deleteChildWidgetsLaterAndDeleteLayout(this);
 
             QWidget* collectionEditor = nullptr;
 

diff --git a/common/src/View/ViewEditor.cpp b/common/src/View/ViewEditor.cpp
@@ -259,7 +259,7 @@ namespace TrenchBroom {
         }
 
         void ViewEditor::createGui() {
-            deleteChildWidgetsAndLayout(this);
+            deleteChildWidgetsLaterAndDeleteLayout(this);
 
             auto* sizer = new QGridLayout();
             sizer->setContentsMargins(