From e7699b531eba4bee262f7214699f07b96f66ba7b Mon Sep 17 00:00:00 2001
From: PaddleStroke <pierrelouis.boyer@gmail.com>
Date: Thu, 27 Jun 2024 10:27:32 +0200
Subject: [PATCH] Assembly: Gears: Fix crash if user selected first elements
 before triggering tool.

---
 src/Mod/Assembly/JointObject.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py
index 4ef2c223e4..4926335a03 100644
--- a/src/Mod/Assembly/JointObject.py
+++ b/src/Mod/Assembly/JointObject.py
@@ -1301,10 +1301,15 @@ class TaskAssemblyCreateJoint(QtCore.QObject):
 
             self.createJointObject()
             self.visibilityBackup = False
-            self.handleInitialSelection()
 
         self.adaptUi()
 
+        if self.creating:
+            # This has to be after adaptUi so that properties default values are adapted
+            # if needed. For instance for gears adaptUi will prevent radii from being 0
+            # before handleInitialSelection tries to solve.
+            self.handleInitialSelection()
+
         self.setJointsPickableState(False)
 
         Gui.Selection.addSelectionGate(