refs #550: fix crash when myObject is NULL

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_StreamOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 95f61a98227a01618a3219457e2bba5092979019..d11ea2c3f3ef669b7479e5c89a86eb8c83e9ba0d 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@ -92,7 +92,8 @@ void HYDROGUI_StreamOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  myEditedObject.Nullify();
+  if ( !myIsEdit || isApplyAndClose() )
+    myEditedObject.Nullify();
   myHydAxis.clear();
   myProfiles.clear();
   myProfileParams.clear();
@@ -104,8 +105,9 @@ void HYDROGUI_StreamOp::startOperation()
   QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_STREAM_NAME" ) );
   if ( myIsEdit )
   {
-    myEditedObject =
-      Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( isApplyAndClose() )
+      myEditedObject =
+        Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if ( !myEditedObject.IsNull() )
     {
       anObjectName = myEditedObject->GetName();