Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TwoImagesOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
index 50ecc0086a3e2640b75f4b4d2966da66cb225b4a..ab3bbb12803e0ca030191d966d29163696e85cd1 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-88,7
+84,8
@@
void HYDROGUI_TwoImagesOp::startOperation()
QString anImageName;
if( myIsEdit )
{
QString anImageName;
if( myIsEdit )
{
- myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_Image)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if( !myEditedObject.IsNull() )
anImageName = myEditedObject->GetName();
}
if( !myEditedObject.IsNull() )
anImageName = myEditedObject->GetName();
}