Fix potential crash when adding a group

wonder-sk · wonder-sk · commit 0a7ddfa17049 · 2014-09-05T18:42:05.000+07:00
diff --git a/src/gui/layertree/qgslayertreeview.cpp b/src/gui/layertree/qgslayertreeview.cpp
@@ -224,7 +224,13 @@ QgsLayerTreeGroup* QgsLayerTreeView::currentGroupNode() const
     if ( QgsLayerTree::isGroup( parent ) )
       return QgsLayerTree::toGroup( node );
   }
-  // TODO: also handle if symbology is selected?
+
+  if ( QgsLayerTreeModelLegendNode* legendNode = layerTreeModel()->index2legendNode( selectionModel()->currentIndex() ) )
+  {
+    QgsLayerTreeLayer* parent = legendNode->parent();
+    if ( QgsLayerTree::isGroup( parent->parent() ) )
+      return QgsLayerTree::toGroup( parent->parent() );
+  }
 
   return 0;
 }
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -113,6 +113,8 @@ QAction* QgsLayerTreeViewDefaultActions::actionGroupSelected( QObject* parent )
 void QgsLayerTreeViewDefaultActions::addGroup()
 {
   QgsLayerTreeGroup* group = mView->currentGroupNode();
+  if ( !group )
+    group = mView->layerTreeModel()->rootGroup();
 
   QgsLayerTreeGroup* newGroup = group->addGroup( uniqueGroupName( group ) );
   mView->edit( mView->layerTreeModel()->node2index( newGroup ) );
@@ -165,8 +167,12 @@ void QgsLayerTreeViewDefaultActions::zoomToLayer( QgsMapCanvas* canvas )
 
 void QgsLayerTreeViewDefaultActions::zoomToGroup( QgsMapCanvas* canvas )
 {
+  QgsLayerTreeGroup* groupNode = mView->currentGroupNode();
+  if ( !groupNode )
+    return;
+
   QList<QgsMapLayer*> layers;
-  foreach ( QString layerId, mView->currentGroupNode()->findLayerIds() )
+  foreach ( QString layerId, groupNode->findLayerIds() )
     layers << QgsMapLayerRegistry::instance()->mapLayer( layerId );
 
   zoomToLayers( canvas, layers );

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,13 @@ QgsLayerTreeGroup* QgsLayerTreeView::currentGroupNode() const`
`224`	`224`	`if ( QgsLayerTree::isGroup( parent ) )`
`225`	`225`	`return QgsLayerTree::toGroup( node );`
`226`	`226`	`}`
`227`		`- // TODO: also handle if symbology is selected?`
	`227`	`+`
	`228`	`+ if ( QgsLayerTreeModelLegendNode* legendNode = layerTreeModel()->index2legendNode( selectionModel()->currentIndex() ) )`
	`229`	`+ {`
	`230`	`+ QgsLayerTreeLayer* parent = legendNode->parent();`
	`231`	`+ if ( QgsLayerTree::isGroup( parent->parent() ) )`
	`232`	`+ return QgsLayerTree::toGroup( parent->parent() );`
	`233`	`+ }`
`228`	`234`
`229`	`235`	`return 0;`
`230`	`236`	`}`