#5972: Leave player start entity selected after placement

codereader · Jun 16, 2022 · ba96f62 · ba96f62
1 parent dad54bb
commit ba96f62
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/radiantcore/selection/algorithm/Entity.cpp b/radiantcore/selection/algorithm/Entity.cpp
@@ -326,6 +326,7 @@ void placePlayerStart(const cmd::ArgumentList& args)
     EntityNodeFindByClassnameWalker walker(PLAYERSTART_CLASSNAME);
     GlobalSceneGraph().root()->traverse(walker);
 
+    auto playerStartNode = walker.getEntityNode();
     auto playerStartEntity = walker.getEntity();
 
     if (playerStartEntity == nullptr)
@@ -334,16 +335,19 @@ void placePlayerStart(const cmd::ArgumentList& args)
         auto eclass = GlobalEntityClassManager().findClass(PLAYERSTART_CLASSNAME);
         if (!eclass) throw cmd::ExecutionNotPossible(_("Could not find the info_player_start entityDef"));
 
-        auto playerStartNode = GlobalEntityModule().createEntity(eclass);
+        playerStartNode = GlobalEntityModule().createEntity(eclass);
         scene::addNodeToContainer(playerStartNode, GlobalSceneGraph().root());
 
-        playerStartEntity = &playerStartNode->getEntity();
+        playerStartEntity = Node_getEntity(playerStartNode);
 
         // Set a default angle
         playerStartEntity->setKeyValue(ANGLE_KEY_NAME, DEFAULT_ANGLE);
     }
 
     playerStartEntity->setKeyValue("origin", string::to_string(position));
+
+    // #5972: Leave player start selected after placement
+    Node_setSelected(playerStartNode, true);
 }
 
 } // namespace algorithm