Draft: fixed bug introduced by OK button

FreeCAD · Feb 1, 2016 · fc9fe3e · fc9fe3e
1 parent 04e9392
commit fc9fe3e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
@@ -204,8 +204,7 @@ def getStandardButtons(self):
         return int(QtGui.QDialogButtonBox.Ok) | int(QtGui.QDialogButtonBox.Close)
     def accept(self):
         if hasattr(FreeCADGui,"draftToolBar"):
-            FreeCADGui.draftToolBar.validatePoint()
-            return True
+            return FreeCADGui.draftToolBar.validatePoint()
         else:
             FreeCADGui.ActiveDocument.resetEdit()
             return True
@@ -1223,8 +1222,11 @@ def validatePoint(self):
                                 numy = last.y + v.y
                                 numz = last.z + v.z
                         self.sourceCmd.numericInput(numx,numy,numz)
+            elif (self.textValue.isVisible() or self.SStringValue.isVisible() or self.SSizeValue.isVisible() or self.STrackValue.isVisible() or self.FFileValue.isVisible()):
+                return False
             else:
                 FreeCADGui.ActiveDocument.resetEdit()
+        return True
 
     def validateSNumeric(self):
         ''' send valid numeric parameters to ShapeString '''