Apply more strict checking before update outside/inside settings

diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index 2d2138222728ebfefbb5e7e351ba40b0f8c52348..393fb46b1f1231afa1bea0fef33c1fe33e4a42e9 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -894,6 +894,12 @@ void
 VISU_GaussPtsAct
 ::UpdateInsideCursorSettings( PDeviceActor theActor )
 {
+  if(!myInsideCursorSettings || myInsideCursorSettings->GetInitial())
+    return;
+
+  if(!myWidgetCtrl->GetEnabled())
+    return;
+
   VISU_GaussPointsPL* aPipeline = theActor->GetPipeLine();
 
   SALOME_ExtractGeometry* anExtractGeometry = aPipeline->GetExtractGeometryFilter();
@@ -903,12 +909,6 @@ VISU_GaussPtsAct
 
   aPipeline->SetImplicitFunction(anImplicitFunction); // To restore
 
-  if(!myInsideCursorSettings || myInsideCursorSettings->GetInitial())
-    return;
-
-  if(!myWidgetCtrl->GetEnabled())
-    return;
-
   aPipeline->SetPrimitiveType( myInsideCursorSettings->GetPrimitiveType() );
   aPipeline->SetClamp( myInsideCursorSettings->GetClamp() );
   aPipeline->SetImageData( myInsideCursorSettings->GetTexture() );
@@ -1118,6 +1118,12 @@ void
 VISU_GaussPtsAct1
 ::UpdateOutsideCursorSettings()
 {
+  if(!myOutsideCursorSettings || myOutsideCursorSettings->GetInitial())
+    return;
+
+  if(!myWidgetCtrl->GetEnabled())
+    return;
+
   VISU_GaussPointsPL* aPipeline = myOutsideDeviceActor->GetPipeLine();
 
   SALOME_ExtractGeometry* anExtractGeometry = aPipeline->GetExtractGeometryFilter();
@@ -1129,12 +1135,6 @@ VISU_GaussPtsAct1
   anExtractGeometry->SetExtractBoundaryCells(true);
   anExtractGeometry->SetExtractInside(true);
 
-  if(!myOutsideCursorSettings || myOutsideCursorSettings->GetInitial())
-    return;
-
-  if(!myWidgetCtrl->GetEnabled())
-    return;
-
   aPipeline->SetPrimitiveType( myOutsideCursorSettings->GetPrimitiveType() );
   aPipeline->SetClamp( myOutsideCursorSettings->GetClamp() );
   aPipeline->SetImageData( myOutsideCursorSettings->GetTexture() );