Fix (potential) crashes due to wrong lambda captures. Disconnect from…

… materials when closing the editor.
codereader · Jul 31, 2021 · 6743a34 · 6743a34
1 parent 2353158
commit 6743a34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -181,6 +181,7 @@ MaterialEditor::MaterialEditor() :
 
 MaterialEditor::~MaterialEditor()
 {
+    _materialChanged.disconnect();
     _materialBindings.clear();
     _stageBindings.clear();
 
@@ -819,7 +820,7 @@ void MaterialEditor::setupMaterialShaderFlags()
         cullTypes->AppendString(pair.first);
     }
 
-    cullTypes->Bind(wxEVT_CHOICE, [=](wxCommandEvent& ev)
+    cullTypes->Bind(wxEVT_CHOICE, [this, cullTypes](wxCommandEvent& ev)
     {
         if (!_material || _materialUpdateInProgress) return;
         _material->setCullType(shaders::getCullTypeForString(cullTypes->GetStringSelection().ToStdString()));
@@ -847,22 +848,22 @@ void MaterialEditor::setupMaterialShaderFlags()
     // DECAL_MACRO
     _materialBindings.emplace(std::make_shared<CheckBoxBinding<MaterialPtr>>(getControl<wxCheckBox>("MaterialHasDecalMacro"),
         [](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasDecalMacro; },
-        [=](const MaterialPtr& material, const bool& newValue) {}));
+        [](const MaterialPtr& material, const bool& newValue) {}));
 
     // TWOSIDED_DECAL_MACRO
     _materialBindings.emplace(std::make_shared<CheckBoxBinding<MaterialPtr>>(getControl<wxCheckBox>("MaterialHasTwoSidedDecalMacro"),
         [](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasTwoSidedDecalMacro; },
-        [=](const MaterialPtr& material, const bool& newValue) {}));
+        [](const MaterialPtr& material, const bool& newValue) {}));
 
     // GLASS_MACRO
     _materialBindings.emplace(std::make_shared<CheckBoxBinding<MaterialPtr>>(getControl<wxCheckBox>("MaterialHasGlassMacro"),
         [](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasGlassMacro; },
-        [=](const MaterialPtr& material, const bool& newValue) {}));
+        [](const MaterialPtr& material, const bool& newValue) {}));
 
     // PARTICLE_MACRO
     _materialBindings.emplace(std::make_shared<CheckBoxBinding<MaterialPtr>>(getControl<wxCheckBox>("MaterialHasParticleMacro"),
         [](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasParticleMacro; },
-        [=](const MaterialPtr& material, const bool& newValue) {}));
+        [](const MaterialPtr& material, const bool& newValue) {}));
 }
 
 void MaterialEditor::setupMaterialSurfaceFlags()
@@ -1269,7 +1270,7 @@ void MaterialEditor::setupMaterialStageProperties()
 
     _stageBindings.emplace(std::make_shared<CheckBoxBinding<IShaderLayer::Ptr>>(getControl<wxCheckBox>("MaterialStageColored"),
         [](const IShaderLayer::Ptr& layer) { return stageQualifiesAsColoured(layer); },
-        [=](const IEditableShaderLayer::Ptr& layer, const bool& value) { _onStageColoredChecked(layer, value); },
+        [this](const IEditableShaderLayer::Ptr& layer, const bool& value) { _onStageColoredChecked(layer, value); },
         std::bind(&MaterialEditor::onMaterialChanged, this),
         std::bind(&MaterialEditor::getEditableStageForSelection, this)));
 

diff --git a/radiant/ui/materials/editor/MaterialEditor.h b/radiant/ui/materials/editor/MaterialEditor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sigc++/connection.h>
+#include <sigc++/trackable.h>
 #include "icommandsystem.h"
 #include "ishaders.h"
 
@@ -19,7 +20,8 @@ namespace ui
 
 class MaterialEditor :
     public wxutil::DialogBase,
-    private wxutil::XmlResourceBasedWidget
+    private wxutil::XmlResourceBasedWidget,
+    public sigc::trackable
 {
 private:
     MaterialTreeView* _treeView;