From bbab50a66b217b2c2884196ef7b52a97cb345c7c Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Fri, 3 Aug 2018 17:35:29 +0800 Subject: [PATCH] assembly: fix auto recompute transaction name --- assembly.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/assembly.py b/assembly.py index 615b40f..bf3222c 100644 --- a/assembly.py +++ b/assembly.py @@ -2426,17 +2426,12 @@ class Assembly(AsmGroup): def onSolverTimer(cls): if not cls.canAutoSolve(): return - ret = FreeCAD.getActiveTransaction() - # if ret: - # logger.debug('skip auto solve because of active transaction ' - # '{}'.format(ret)) - # return from . import solver - if not ret: - FreeCAD.setActiveTransaction('Assembly auto recompute') - logger.catch('solver exception when auto recompute', - solver.solve, FreeCAD.ActiveDocument.Objects, True) - if not ret: + FreeCAD.setActiveTransaction('Assembly auto recompute') + if not logger.catch('solver exception when auto recompute', + solver.solve, FreeCAD.ActiveDocument.Objects, True): + FreeCAD.closeActiveTransaction(True) + else: FreeCAD.closeActiveTransaction() @classmethod