From 98cc9913a40de44060194907746281c57f8a8ae9 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Mon, 1 Feb 2016 20:28:30 -0200
Subject: [PATCH] Draft: fixed bug introduced by OK button

---
 src/Mod/Draft/DraftGui.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 0de6d70a22..a901459a2e 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -204,8 +204,7 @@ class DraftTaskPanel:
         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 @@ class DraftToolBar:
                                 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 '''