From ed5b51149d98491d5638cd63bb87ac598778de38 Mon Sep 17 00:00:00 2001
From: azv <azv@opencascade.com>
Date: Fri, 14 Jun 2019 11:47:41 +0300
Subject: [PATCH] Check sketch itself when storing the current feature while
 reexecuting features, which may produce additional sketch entities.

---
 src/SketchPlugin/SketchPlugin_Feature.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SketchPlugin/SketchPlugin_Feature.cpp b/src/SketchPlugin/SketchPlugin_Feature.cpp
index 9663e22c5..e006d6c6d 100644
--- a/src/SketchPlugin/SketchPlugin_Feature.cpp
+++ b/src/SketchPlugin/SketchPlugin_Feature.cpp
@@ -62,7 +62,10 @@ void SketchPlugin_Feature::keepCurrentFeature()
   FeaturePtr aCurFeature = document()->currentFeature(true);
   std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
       std::dynamic_pointer_cast<SketchPlugin_Feature>(aCurFeature);
-  if (!aSketchFeature || aSketchFeature->sketch() == sketch())
+  std::shared_ptr<SketchPlugin_Sketch> aSketch =
+      std::dynamic_pointer_cast<SketchPlugin_Sketch>(aCurFeature);
+  if ((!aSketchFeature || aSketchFeature->sketch() != sketch()) &&
+      (!aSketch || aSketch.get() != sketch()))
     myCurrentFeature = aCurFeature;
 }
 
-- 
2.39.2