X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_PagedContainer.cpp;h=b659b82c285a66bed2455987ca2ebe63ec396b82;hb=77ce6d35ac8d2f0fdaecb4f23e0870bf74e36103;hp=d96a7c70a8cdf6693424e4f96ebfdc552c2fd59e;hpb=b920c09959b52a2f62c387764131606a2ca2cd11;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp
index d96a7c70a..b659b82c2 100644
--- a/src/ModuleBase/ModuleBase_PagedContainer.cpp
+++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -103,16 +103,13 @@ bool ModuleBase_PagedContainer::restoreValueCustom()
   AttributeStringPtr aStringAttr = aData->string(attributeID());
   QString aCaseId;
   if (aStringAttr->isInitialized()) {
-    if (myIsEditing)
-      aCaseId = QString::fromStdString(aStringAttr->value());
-    else
-      aCaseId = QString::fromStdString(aDefVal.empty() ? aStringAttr->value() : aDefVal);
-    if (!aStringAttr->isInitialized())
-      storeValueCustom();
+    aCaseId = QString::fromStdString(aStringAttr->value());
     int idx = myCaseIds.indexOf(aCaseId);
     if (idx == -1)
       idx = currentPageIndex();
     setCurrentPageIndex(idx);
+    if (aStringAttr->value() != aCaseId.toStdString())
+      storeValueCustom();
   }
   else {
     // It is added because if user edits the feature created from Python