#5628: Don't use inactive actions in the view

codereader · May 31, 2021 · 700bb54 · 700bb54
1 parent b2a9725
commit 700bb54
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -1383,6 +1383,8 @@ void EntityInspector::handleMergeActions(const scene::INodePtr& selectedNode)
 
     mergeNode->foreachMergeAction([&](const scene::merge::IMergeAction::Ptr& action)
     {
+        if (!action->isActive()) return; // don't apply inactive actions to our view
+
         auto entityKeyValueAction = std::dynamic_pointer_cast<scene::merge::IEntityKeyValueMergeAction>(action);
 
         if (!entityKeyValueAction) return;