Merge remote-tracking branch 'origin/BR_REENTRANCE_OPERATION' into origin_Dev_1.5.0

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

diff --git a/src/ModuleBase/ModuleBase_FilterValidated.cpp b/src/ModuleBase/ModuleBase_FilterValidated.cpp
index 3fdb61e15506e7cc77360290ccfadba68b760c17..08314d734cc3cf2793e3e601ac6a9a53d891551d 100644 (file)
--- a/src/ModuleBase/ModuleBase_FilterValidated.cpp
+++ b/src/ModuleBase/ModuleBase_FilterValidated.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        ModuleBase_FilterValidated.h
+// File:        ModuleBase_FilterValidated.cpp
 // Created:     17 Mar 2015
 // Author:      Natalia ERMOLAEVA
 
@@ -23,11 +23,11 @@ Standard_Boolean ModuleBase_FilterValidated::IsOk(const Handle(SelectMgr_EntityO
   ModuleBase_Operation* anOperation = myWorkshop->module()->currentOperation();
   if (anOperation) {
     ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
-    ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
-    if (!anActiveWidget)
-      anActiveWidget = aPanel->preselectionWidget();
+    ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();
+    if (!aCurrentWidget)
+      aCurrentWidget = myWorkshop->module()->activeWidget();
     ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
-                                                                           (anActiveWidget);
+                                                                           (aCurrentWidget);
     ModuleBase_ViewerPrs aPrs;
     myWorkshop->selection()->fillPresentation(aPrs, theOwner);