From 0302b3de5f347d737eff3e9b00a22396d8ba2772 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@freecad.org>
Date: Mon, 10 Mar 2025 11:23:47 +0100
Subject: [PATCH] Assembly: Minor refactor in
 ViewProviderAssembly::findDragMode

Co-Developed-by: PaddleStroke <pierrelouis.boyer@gmail.com>
---
 src/Mod/Assembly/Gui/ViewProviderAssembly.cpp | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
index c87cf5622f..839eb832ee 100644
--- a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
+++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
@@ -861,24 +861,27 @@ ViewProviderAssembly::DragMode ViewProviderAssembly::findDragMode()
 {
     auto addPartsToMove = [&](const std::vector<Assembly::ObjRef>& refs) {
         for (auto& partRef : refs) {
-            if (!partRef.obj) {
+            auto obj = partRef.obj;
+            auto ref = partRef.ref;
+            if (!obj || !ref) {
                 continue;
             }
-            auto* pPlc = dynamic_cast<App::PropertyPlacement*>(
-                partRef.obj->getPropertyByName("Placement")
-            );
-            if (pPlc) {
-                App::DocumentObject* selRoot = partRef.ref->getValue();
-                if (!selRoot) {
-                    continue;
-                }
-                std::vector<std::string> subs = partRef.ref->getSubValues();
-                if (subs.empty()) {
-                    continue;
-                }
 
-                docsToMove.emplace_back(partRef.obj, pPlc->getValue(), selRoot, subs[0]);
+            auto pPlc = dynamic_cast<App::PropertyPlacement*>(obj->getPropertyByName("Placement"));
+            if (!pPlc) {
+                continue;
             }
+
+            App::DocumentObject* selRoot = ref->getValue();
+            if (!selRoot) {
+                continue;
+            }
+            std::vector<std::string> subs = ref->getSubValues();
+            if (subs.empty()) {
+                continue;
+            }
+
+            docsToMove.emplace_back(obj, pPlc->getValue(), selRoot, subs[0]);
         }
     };