Fix incorrect projection if raster or plugin layer is first layer

nyalldawson · nyalldawson · commit 15d2be26f123 · 2016-03-15T12:19:44.000+11:00
loaded into an empty project (fix #14392)
diff --git a/src/gui/layertree/qgslayertreemapcanvasbridge.cpp b/src/gui/layertree/qgslayertreemapcanvasbridge.cpp
@@ -144,10 +144,10 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
           continue;
 
         QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layerNode->layer() );
-        if ( vl && vl->geometryType() != QGis::NoGeometry )
+        if ( !vl || vl->geometryType() != QGis::NoGeometry )
         {
-          mCanvas->setDestinationCrs( vl->crs() );
-          mCanvas->setMapUnits( vl->crs().mapUnits() );
+          mCanvas->setDestinationCrs( layerNode->layer()->crs() );
+          mCanvas->setMapUnits( layerNode->layer()->crs().mapUnits() );
           break;
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,10 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()`
`144`	`144`	`continue;`
`145`	`145`
`146`	`146`	`QgsVectorLayer vl = qobject_cast<QgsVectorLayer >( layerNode->layer() );`
`147`		`- if ( vl && vl->geometryType() != QGis::NoGeometry )`
	`147`	`+ if ( !vl \|\| vl->geometryType() != QGis::NoGeometry )`
`148`	`148`	`{`
`149`		`- mCanvas->setDestinationCrs( vl->crs() );`
`150`		`- mCanvas->setMapUnits( vl->crs().mapUnits() );`
	`149`	`+ mCanvas->setDestinationCrs( layerNode->layer()->crs() );`
	`150`	`+ mCanvas->setMapUnits( layerNode->layer()->crs().mapUnits() );`
`151`	`151`	`break;`
`152`	`152`	`}`
`153`	`153`	`}`