From 6356636b0496c6bdd5dffcdbd50c7dcfb04660fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= <stefantroeger@gmx.net>
Date: Thu, 8 Dec 2016 08:17:31 +0100
Subject: [PATCH] PartDesign: Fix crash on datum abort

---
 src/Mod/PartDesign/Gui/TaskDatumParameters.cpp | 10 ++++++++--
 src/Mod/PartDesign/Gui/TaskDatumParameters.h   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
index 23080d2fc..46a8eed0c 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
@@ -77,8 +77,6 @@ TaskDatumParameters::TaskDatumParameters(ViewProviderDatum *ViewProvider,QWidget
 
 TaskDatumParameters::~TaskDatumParameters()
 {
-    Gui::Selection().rmvSelectionGate();
-    static_cast<ViewProviderDatum*>(ViewProvider)->setPickable(true);
 }
 
 
@@ -100,6 +98,14 @@ TaskDlgDatumParameters::~TaskDlgDatumParameters()
 
 }
 
+bool TaskDlgDatumParameters::reject() {
+    
+    Gui::Selection().rmvSelectionGate();
+    static_cast<ViewProviderDatum*>(ViewProvider)->setPickable(true);
+    return PartGui::TaskDlgAttacher::reject();
+}
+
+
 bool TaskDlgDatumParameters::accept() {
 
     std::string name = ViewProvider->getObject()->getNameInDocument();
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.h b/src/Mod/PartDesign/Gui/TaskDatumParameters.h
index ac977ba64..42a887f08 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.h
@@ -65,6 +65,7 @@ public:
     ~TaskDlgDatumParameters();
     
     virtual bool accept();
+    virtual bool reject();
 };
 
 } //namespace PartDesignGui