refs #550: fix crash when myObject is NULL

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

diff --git a/src/HYDROGUI/HYDROGUI_NameValidator.cxx b/src/HYDROGUI/HYDROGUI_NameValidator.cxx
index 5c6630410c319a6ebcea625addae20dd851352b8..006710c07f2babc92ea7167aa0511e274f4dac55 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_NameValidator.cxx
+++ b/src/HYDROGUI/HYDROGUI_NameValidator.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,18 +34,21 @@ QValidator::State HYDROGUI_NameValidator::validate( QString & theName, int & the
   State aRes = Acceptable;
   QString aName = theName.simplified();
 
-  if ( aName.isEmpty() )
-  {
-    aRes = Intermediate;
-  }
-  else if( !myEditedObject.IsNull() && myEditedObject->GetName() != theName )
+  if( !myEditedObject.IsNull() ) // To avoid problems when myEditedObject is not set yet
   {
-    // check that there are no other objects with the same name in the document
-    Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( myModule, aName );
-    if ( !anObject.IsNull() )
+    if ( aName.isEmpty() )
     {
       aRes = Intermediate;
     }
+    else if( myEditedObject->GetName() != theName )
+    {
+      // check that there are no other objects with the same name in the document
+      Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( myModule, aName );
+      if ( !anObject.IsNull() )
+      {
+        aRes = Intermediate;
+      }
+    }
   }
 
   return aRes;
@@ -67,7 +66,10 @@ void HYDROGUI_NameValidator::fixup( QString & theName ) const
     emit alreadyExists( theName );
   }
 
-  theName = myEditedObject->GetName();
+  if( !myEditedObject.IsNull() )
+  {
+    theName = myEditedObject->GetName();
+  }
 }
 
 void HYDROGUI_NameValidator::setEditedObject( const Handle(HYDROData_Entity) theObj )