#5532: Remove unmapped pages to prevent resource leaks

codereader · Mar 21, 2021 · 0b1fbf9 · 0b1fbf9
1 parent fa071ec
commit 0b1fbf9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/radiant/ui/materials/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp
@@ -175,6 +175,22 @@ MaterialEditor::MaterialEditor() :
     updateControlsFromMaterial();
 }
 
+MaterialEditor::~MaterialEditor()
+{
+    auto notebook = getControl<wxNotebook>("MaterialStageSettingsNotebook");
+
+    // Remove all umapped pages to avoid memory leaks
+    for (const auto& pair : _notebookPages)
+    {
+        if (notebook->FindPage(pair.first) == -1)
+        {
+            pair.first->Destroy();
+        }
+    }
+
+    _notebookPages.clear();
+}
+
 int MaterialEditor::ShowModal()
 {
     // Restore the position

diff --git a/radiant/ui/materials/MaterialEditor.h b/radiant/ui/materials/MaterialEditor.h
@@ -82,6 +82,7 @@ class MaterialEditor :
 
 private:
     MaterialEditor();
+    ~MaterialEditor();
 
     int ShowModal() override;