Merge pull request #80607 from lawnjelly/fix_tileset_signal_crash

Fix crash on exit where `TileSet` calls destroyed `TileSetAtlasSourceEditor`

1 files changed, 6 insertions, 0 deletions

diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp
index c98d9086d1..b1111be006 100644
--- a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp
+++ b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp
@@ -2655,6 +2655,12 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 TileSetAtlasSourceEditor::~TileSetAtlasSourceEditor() {
 	memdelete(tile_proxy_object);
 	memdelete(atlas_source_proxy_object);
+
+	// Remove listener for old objects, so the TileSet doesn't
+	// try to call the destroyed TileSetAtlasSourceEditor.
+	if (tile_set.is_valid()) {
+		tile_set->disconnect_changed(callable_mp(this, &TileSetAtlasSourceEditor::_tile_set_changed));
+	}
 }
 
 ////// EditorPropertyTilePolygon //////