From: mpv <mpv@opencascade.com>
Date: Mon, 9 Jan 2017 15:56:22 +0000 (+0300)
Subject: Fix for the issue #1968
X-Git-Tag: V_2.7.0~346^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b27ed963fce6b3bd949e257270125981f539a577;p=modules%2Fshaper.git

Fix for the issue #1968
---

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index 8391d72f5..8fc2d5e77 100644
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -929,10 +929,8 @@ void Model_AttributeSelection::selectConstruction(
     }
   }
   // store the selected as primitive
-  TNaming_Builder aBuilder(selectionLabel());
-  aBuilder.Generated(aSubShape);
-    registerSubShape(
-      selectionLabel(), aSubShape, 0, aContextFeature, aMyDoc, anOrientations, aSubNames, aRefs);
+  registerSubShape(
+    selectionLabel(), aSubShape, 0, aContextFeature, aMyDoc, anOrientations, aSubNames, aRefs);
 }
 
 bool Model_AttributeSelection::selectPart(
@@ -1156,6 +1154,8 @@ void Model_AttributeSelection::updateInHistory()
   // that this one and is really modifies the referenced result to refer to it
   ResultPtr aModifierResFound;
   TNaming_Iterator aPairIter(aContNS);
+  if (!aPairIter.More())
+    return;
   TopoDS_Shape aNewShape = aPairIter.NewShape();
   bool anIterate = true;
   // trying to update also the sub-shape selected