Merge pull request TrenchBroom#4334 from TrenchBroom/4306

4306: Don't crash trying to merge a group into an open group
jjelliott · Sep 17, 2023 · f7c04bb · f7c04bb
2 parents b7de79d + 814a76d
commit f7c04bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/common/src/View/MapViewBase.cpp b/common/src/View/MapViewBase.cpp
@@ -1556,16 +1556,14 @@ Model::GroupNode* MapViewBase::findGroupToMergeGroupsInto(
   const auto hits = pickResult().all(type(Model::nodeHitType()));
   if (!hits.empty())
   {
-    auto* mergeTarget = findOutermostClosedGroup(Model::hitToNode(hits.front()));
-
-    const auto canReparentAll = std::all_of(
-      selectedNodes.nodes().begin(), selectedNodes.nodes().end(), [&](const auto* node) {
-        return node == mergeTarget || canReparentNode(node, mergeTarget);
-      });
-
-    if (canReparentAll)
+    if (auto* mergeTarget = findOutermostClosedGroup(Model::hitToNode(hits.front())))
     {
-      return mergeTarget;
+      if (kdl::all_of(selectedNodes.nodes(), [&](const auto* node) {
+            return node == mergeTarget || canReparentNode(node, mergeTarget);
+          }))
+      {
+        return mergeTarget;
+      }
     }
   }
 

diff --git a/common/test/src/View/tst_CompilationRunner.cpp b/common/test/src/View/tst_CompilationRunner.cpp
@@ -162,8 +162,9 @@ TEST_CASE_METHOD(
   CHECK(exec.ended == !treatNonZeroResultCodeAsError);
 }
 
-#if !defined(_WIN32) || defined(NDEBUG)
+#if (defined(_WIN64) && defined(NDEBUG)) || !defined(_WIN32)
 // std::abort pops up a dialog when run in debug mode on Windows
+// the test is unreliable on Windows 32bit
 TEST_CASE_METHOD(MapDocumentTest, "CompilationRunToolTaskRunner.toolAborts")
 {
   auto variables = EL::NullVariableStore{};