Issue #2024 - Redesign of circle and arc of circle: fill Reference Attribute

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

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp
index 42d48907f6a4cead710bdbf9253e6de3be06e751..8723cbd778aad168f207e7025d1925b8f62c75bd 100644 (file)
--- a/src/ModuleBase/ModuleBase_PagedContainer.cpp
+++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp
@@ -111,8 +111,13 @@ bool ModuleBase_PagedContainer::storeValueCustom()
 
 void ModuleBase_PagedContainer::onPageChanged()
 {
-  storeValue();
-  if (myIsFocusOnCurrentPage) focusTo();
+  if (!storeValue())
+    return;
+  // focus might be changed only if the value is correcly stored
+  // if it is not stored, reentrant manager will handle by this widget
+  // after it will restart operation, the widget might be removed
+  if (myIsFocusOnCurrentPage)
+    focusTo();
 }