Issue #1901: Restore field from Python script

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

diff --git a/src/ModuleBase/ModuleBase_FilterValidated.cpp b/src/ModuleBase/ModuleBase_FilterValidated.cpp
index 2a9debb0bdd38f9a1acddef00d820775fcf51bce..829a70579781f50ef707254da7e524f3924f68bf 100644 (file)
--- a/src/ModuleBase/ModuleBase_FilterValidated.cpp
+++ b/src/ModuleBase/ModuleBase_FilterValidated.cpp
@@ -30,20 +30,22 @@ Standard_Boolean ModuleBase_FilterValidated::
     Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
 
     ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
-    ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();
-    if (!aCurrentWidget)
-      aCurrentWidget = myWorkshop->module()->activeWidget();
-    if (aCurrentWidget) {
-      ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
-      myWorkshop->selection()->fillPresentation(aPrs, theOwner);
-      ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
-                                                                             (aCurrentWidget);
-      if (aWidgetValidated)
-        aValid = !aWidgetValidated || aWidgetValidated->isValidSelection(aPrs);
-      else{
-        ModuleBase_WidgetValidator* aWidgetValidator = aCurrentWidget->widgetValidator();
-        if (aWidgetValidator)
-          aValid = aWidgetValidator->isValidSelection(aPrs);
+    if (aPanel) {
+      ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();
+      if (!aCurrentWidget)
+        aCurrentWidget = myWorkshop->module()->activeWidget();
+      if (aCurrentWidget) {
+        ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
+        myWorkshop->selection()->fillPresentation(aPrs, theOwner);
+        ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+                                                                               (aCurrentWidget);
+        if (aWidgetValidated)
+          aValid = !aWidgetValidated || aWidgetValidated->isValidSelection(aPrs);
+        else{
+          ModuleBase_WidgetValidator* aWidgetValidator = aCurrentWidget->widgetValidator();
+          if (aWidgetValidator)
+            aValid = aWidgetValidator->isValidSelection(aPrs);
+        }
       }
     }
   }