From 26f73b4a0e0baed10bec8160dcc35611562224fc Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 1 Nov 2016 11:03:57 -0700 Subject: [PATCH] Fixed consecutive abort of job editing and selection of current base object. --- src/Mod/Path/PathScripts/PathJob.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py index deba4eaa7..f45f41784 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/PathScripts/PathJob.py @@ -163,6 +163,7 @@ class ViewProviderJob: taskd = TaskPanel(vobj.Object, self.deleteObjectsOnReject()) FreeCADGui.Control.showDialog(taskd) taskd.setupUi() + self.deleteOnReject = False return True def getIcon(self): @@ -324,10 +325,11 @@ class TaskPanel: self.form.PathsList.addItem(child.Name) baseindex = -1 - if self.obj.Base is not None: + if self.obj.Base: baseindex = self.form.cboBaseObject.findText(self.obj.Base.Name, QtCore.Qt.MatchFixedString) - for o in FreeCADGui.Selection.getCompleteSelection(): - baseindex = self.form.cboBaseObject.findText(o.Name, QtCore.Qt.MatchFixedString) + else: + for o in FreeCADGui.Selection.getCompleteSelection(): + baseindex = self.form.cboBaseObject.findText(o.Name, QtCore.Qt.MatchFixedString) print baseindex if baseindex >= 0: self.form.cboBaseObject.blockSignals(True)