fix zooming to layers when there are empty layers

qgis · Aug 5, 2014 · 3459413 · 3459413
1 parent 9a98ed1
commit 3459413
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -192,6 +192,7 @@ void QgsLayerTreeViewDefaultActions::zoomToGroup()
 void QgsLayerTreeViewDefaultActions::zoomToLayers( QgsMapCanvas* canvas, const QList<QgsMapLayer*>& layers )
 {
   QgsRectangle extent;
+  extent.setMinimal();
 
   for ( int i = 0; i < layers.size(); ++i )
   {
@@ -208,14 +209,14 @@ void QgsLayerTreeViewDefaultActions::zoomToLayers( QgsMapCanvas* canvas, const Q
       layerExtent = vLayer->extent();
     }
 
+    if ( layerExtent.isNull() )
+      continue;
+
     //transform extent if otf-projection is on
     if ( canvas->hasCrsTransformEnabled() )
       layerExtent = canvas->mapSettings().layerExtentToOutputExtent( layer, layerExtent );
 
-    if ( i == 0 )
-      extent = layerExtent;
-    else
-      extent.combineExtentWith( &layerExtent );
+    extent.combineExtentWith( &layerExtent );
   }
 
   if ( extent.isNull() )