[Bugfix]Gui: detach field sensor of draggers and handle post-call of …

…callbacks, fixes FreeCAD#9465
0penBrain · Jul 23, 2023 · 662adaf · 662adaf
1 parent 2167fb6
commit 662adaf
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/Gui/SoFCCSysDragger.cpp b/src/Gui/SoFCCSysDragger.cpp
@@ -128,7 +128,8 @@ TDragger::TDragger()
 
 TDragger::~TDragger()
 {
-
+ fieldSensor.setData(nullptr);
+ fieldSensor.detach();
 }
 
 void TDragger::buildFirstInstance()
@@ -216,9 +217,12 @@ void TDragger::fieldSensorCB(void *f, SoSensor *)
 {
  auto sudoThis = static_cast<TDragger *>(f);
 
- SbMatrix matrix = sudoThis->getMotionMatrix(); // clazy:exclude=rule-of-two-soft
- sudoThis->workFieldsIntoTransform(matrix);
- sudoThis->setMotionMatrix(matrix);
+ if(!f)
+ return;
+
+ SbMatrix matrix = sudoThis->getMotionMatrix(); // clazy:exclude=rule-of-two-soft
+ sudoThis->workFieldsIntoTransform(matrix);
+ sudoThis->setMotionMatrix(matrix);
 }
 
 void TDragger::valueChangedCB(void *, SoDragger *d)
@@ -402,7 +406,8 @@ RDragger::RDragger()
 
 RDragger::~RDragger()
 {
-
+ fieldSensor.setData(nullptr);
+ fieldSensor.detach();
 }
 
 void RDragger::buildFirstInstance()
@@ -488,9 +493,12 @@ void RDragger::fieldSensorCB(void *f, SoSensor *)
 {
  auto sudoThis = static_cast<RDragger *>(f);
 
- SbMatrix matrix = sudoThis->getMotionMatrix(); // clazy:exclude=rule-of-two-soft
- sudoThis->workFieldsIntoTransform(matrix);
- sudoThis->setMotionMatrix(matrix);
+ if(!f)
+ return;
+
+ SbMatrix matrix = sudoThis->getMotionMatrix(); // clazy:exclude=rule-of-two-soft
+ sudoThis->workFieldsIntoTransform(matrix);
+ sudoThis->setMotionMatrix(matrix);
 }
 
 void RDragger::valueChangedCB(void *, SoDragger *d)