From 15cffe060c24e4c7fe67746664340655dc39e29d Mon Sep 17 00:00:00 2001 From: andrew-softdev Date: Sun, 3 Jan 2021 15:13:35 +0000 Subject: Fix for reselecting a TileMap node without first de-selecting it --- editor/plugins/tile_map_editor_plugin.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 860b974632..85e7106162 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -39,7 +39,10 @@ #include "scene/gui/split_container.h" void TileMapEditor::_node_removed(Node *p_node) { - if (p_node == node) { + if (p_node == node && node) { + // Fixes #44824, which describes a situation where you can reselect a TileMap node without first de-selecting it when switching scenes. + node->disconnect("settings_changed", callable_mp(this, &TileMapEditor::_tileset_settings_changed)); + node = nullptr; } } -- cgit v1.2.3