From 4e46cb0a01d1ec7105de797643228a1ce1bba41a Mon Sep 17 00:00:00 2001 From: Chris Galvan Date: Tue, 21 Sep 2021 11:14:47 -0500 Subject: [PATCH 1/2] Prevent crash in Landscape Canvas when creating a prefab from an open graph. Signed-off-by: Chris Galvan --- .../Code/Source/Editor/MainWindow.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp index 836eec682e..184f6eb886 100644 --- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp +++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp @@ -2512,6 +2512,25 @@ namespace LandscapeCanvasEditor { // See comment above in OnPrefabInstancePropagationBegin m_prefabPropagationInProgress = false; + + // After prefab propagation is complete, the entity tied to one of our open + // graphs might have been deleted (e.g. if a prefab was created from that entity), + // so we need to close that graph to be safe. We need to close them in a separate + // iterator because the CloseEditor API will end up modifying m_dockWidgetsByEntity. + AZStd::vector dockWidgetsToDelete; + for (auto [entityId, dockWidgetId] : m_dockWidgetsByEntity) + { + AZ::Entity* entity = nullptr; + AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId); + if (!entity) + { + dockWidgetsToDelete.push_back(dockWidgetId); + } + } + for (auto dockWidgetId : dockWidgetsToDelete) + { + CloseEditor(dockWidgetId); + } } void MainWindow::OnCryEditorEndCreate() From 2bba8fe9a3748c8a4c0e4e295a6a41784f740e13 Mon Sep 17 00:00:00 2001 From: Chris Galvan Date: Tue, 21 Sep 2021 11:57:17 -0500 Subject: [PATCH 2/2] Clarified behavior in comment. Signed-off-by: Chris Galvan --- Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp index 184f6eb886..4574b938f6 100644 --- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp +++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp @@ -2514,9 +2514,10 @@ namespace LandscapeCanvasEditor m_prefabPropagationInProgress = false; // After prefab propagation is complete, the entity tied to one of our open - // graphs might have been deleted (e.g. if a prefab was created from that entity), - // so we need to close that graph to be safe. We need to close them in a separate - // iterator because the CloseEditor API will end up modifying m_dockWidgetsByEntity. + // graphs might have been deleted (e.g. if a prefab was created from that entity). + // Any open graphs tied to an entity that no longer exists will need to be closed. + // We need to close them in a separate iterator because the CloseEditor API will + // end up modifying m_dockWidgetsByEntity. AZStd::vector dockWidgetsToDelete; for (auto [entityId, dockWidgetId] : m_dockWidgetsByEntity) {