Issue #2388: Take into account attribute ID for remembering of a user choice

[modules/shaper.git] / src / ModuleBase / ModuleBase_PagedContainer.cpp

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp
index 27c685f8b3bfe7e3d0923ac681f292e3452816a0..8ba5a314ea7f35d8a129f2ea36473cee22a0ed98 100644 (file)
--- a/src/ModuleBase/ModuleBase_PagedContainer.cpp
+++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp
@@ -40,8 +40,8 @@ ModuleBase_PagedContainer::ModuleBase_PagedContainer(QWidget* theParent,
   // 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.
   myIsObligatory = false;
-  if (defaultValues.contains(myFeatureId))
-    myDefValue = defaultValues[myFeatureId];
+  if (defaultValues.contains(myFeatureId + attributeID()))
+    myDefValue = defaultValues[myFeatureId + attributeID()];
 }
 
 ModuleBase_PagedContainer::~ModuleBase_PagedContainer()
@@ -150,6 +150,6 @@ void ModuleBase_PagedContainer::onPageChanged()
 
 void ModuleBase_PagedContainer::onFeatureAccepted()
 {
-  defaultValues[myFeatureId] = myDefValue;
+  defaultValues[myFeatureId + attributeID()] = myDefValue;
 }