From: dmv <dmv@opencascade.com>
Date: Fri, 17 Sep 2010 14:12:16 +0000 (+0000)
Subject: Dialog crashed on selected vertex as subshape, if Main Object is not selected yet.
X-Git-Tag: V5_1_5a1~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=356b2900425683b134311c1ae731b20b47398f6a;p=modules%2Fgeom.git

Dialog crashed on selected vertex as subshape, if Main Object is not selected yet.
---

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 8391cb3bf..07f5eae4e 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -473,7 +473,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
     }
   }
   else { // an attempt to synchronize list box selection with 3d viewer
-    if (myBusy) {
+    if ( myBusy || myMainObj->_is_nil() ) {
       return;
     }
 
@@ -617,7 +617,8 @@ int GroupGUI_GroupDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMap
   theMapIndex.Clear();
 
   SalomeApp_Application* app = myGeomGUI->getApp();
-  if (!app) return 0;
+  if ( !app || myMainObj->_is_nil() )
+    return 0;
 
   LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   SALOME_ListIO aSelList;