From b920c09959b52a2f62c387764131606a2ca2cd11 Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Mon, 10 Aug 2020 17:06:38 +0300
Subject: [PATCH] bos #19890: Fix wrong initialized type of symmetry operation
 in property panel

---
 src/ModuleBase/ModuleBase_PagedContainer.cpp | 8 +++-----
 src/ModuleBase/ModuleBase_PagedContainer.h   | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp
index f821c793f..d96a7c70a 100644
--- a/src/ModuleBase/ModuleBase_PagedContainer.cpp
+++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp
@@ -34,7 +34,7 @@ static QMap<std::string, std::string> defaultValues;
 ModuleBase_PagedContainer::ModuleBase_PagedContainer(QWidget* theParent,
                                                      const Config_WidgetAPI* theData)
 : ModuleBase_ModelWidget(theParent, theData),
-  myRemeberChoice(true), myIsFocusOnCurrentPage(false), myIsFirst(true)
+  myRemeberChoice(true), myIsFocusOnCurrentPage(false)
 {
   // it is not obligatory to be ignored when property panel tries to activate next active widget
   // but if focus is moved to this control, it can accept it.
@@ -107,7 +107,7 @@ bool ModuleBase_PagedContainer::restoreValueCustom()
       aCaseId = QString::fromStdString(aStringAttr->value());
     else
       aCaseId = QString::fromStdString(aDefVal.empty() ? aStringAttr->value() : aDefVal);
-    if (myIsFirst)
+    if (!aStringAttr->isInitialized())
       storeValueCustom();
     int idx = myCaseIds.indexOf(aCaseId);
     if (idx == -1)
@@ -140,7 +140,7 @@ bool ModuleBase_PagedContainer::storeValueCustom()
 
   AttributeStringPtr aStringAttr = aData->string(attributeID());
   std::string aWidgetValue;
-  if (myIsFirst)
+  if (!aStringAttr->isInitialized())
     aWidgetValue = myDefValue.empty()?
         myCaseIds.at(currentPageIndex()).toStdString() : myDefValue;
   else
@@ -148,8 +148,6 @@ bool ModuleBase_PagedContainer::storeValueCustom()
   myDefValue = aWidgetValue;
   aStringAttr->setValue(aWidgetValue);
 
-  myIsFirst = false;
-
   updateObject(myFeature); // for preview
   return true;
 }
diff --git a/src/ModuleBase/ModuleBase_PagedContainer.h b/src/ModuleBase/ModuleBase_PagedContainer.h
index 9e60263de..0227e4b2f 100644
--- a/src/ModuleBase/ModuleBase_PagedContainer.h
+++ b/src/ModuleBase/ModuleBase_PagedContainer.h
@@ -92,7 +92,6 @@ class MODULEBASE_EXPORT ModuleBase_PagedContainer : public ModuleBase_ModelWidge
   bool myIsFocusOnCurrentPage;
   QStringList myCaseIds;
   QList<ModuleBase_PageBase*> myPages;
-  bool myIsFirst;
   std::string myDefValue;
 };
 
-- 
2.39.2