From 0c5a94028023d056173539e66ef4d3e8e4cfc883 Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Mon, 18 Feb 2019 11:58:27 +0300
Subject: [PATCH] An additiona lcondition to avoid crash in some Abort cases

---
 src/Model/Model_AttributeSelection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index 00736a73e..129eb2bbb 100644
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -1306,7 +1306,7 @@ void Model_AttributeSelection::updateInHistory()
               continue;
 
             FeaturePtr aRefFeat = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRef)->owner());
-            if (aRefFeat.get() && aRefFeat != owner()) {
+            if (aRefFeat.get() && aRefFeat != owner() && aRefFeat->firstResult().get()) {
               FeaturePtr aThisFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
               if (!aDoc->isLaterByDep(aRefFeat, aThisFeature)) { // found better feature
                 aFoundNewContext = true;
-- 
2.39.2