Fix bug 12290: Exception in Mesh when creating a group on geometry while Geometry...

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index f113bc8f0b2974cda76367e146941a0613dc10b6..31c71174475343b627d009bb24a74cfffa91b199 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -77,16 +77,22 @@ extern "C" {
 
 
 
-GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil(); 
+GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil();
 
-GEOM::GEOM_Gen_var   GeometryGUI::GetGeomGen()        { return GeometryGUI::myComponentGeom; }
+GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen()
+{
+  // Bug 12290: exception in Mesh GUI on GEOMBase::GetShape() if Geometry GUI hasn't been loaded
+  if (CORBA::is_nil(myComponentGeom))
+    InitGeomGen();
+  return GeometryGUI::myComponentGeom;
+}
 
-bool GeometryGUI::InitGeomGen() 
+bool GeometryGUI::InitGeomGen()
 {
   GeometryGUI aGG;
-  if( CORBA::is_nil( myComponentGeom ) ) return false;   
-  return true; 
-}                         
+  if( CORBA::is_nil( myComponentGeom ) ) return false;
+  return true;
+}
 
 //=======================================================================
 // function : ClientSObjectToObject