Fix zoom to visibile scale when min/max scale is set to 0

nyalldawson · nyalldawson · commit f7bfb9ceea40 · 2017-06-09T09:36:15.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9010,11 +9010,11 @@ void QgisApp::zoomToLayerScale()
   if ( layer && layer->hasScaleBasedVisibility() )
   {
     const double scale = mMapCanvas->scale();
-    if ( scale > layer->minimumScale() )
+    if ( scale > layer->minimumScale() && layer->minimumScale() > 0 )
     {
       mMapCanvas->zoomScale( layer->minimumScale() * Qgis::SCALE_PRECISION );
     }
-    else if ( scale <= layer->maximumScale() )
+    else if ( scale <= layer->maximumScale() && layer->maximumScale() > 0 )
     {
       mMapCanvas->zoomScale( layer->maximumScale() );
     }

Original file line number	Diff line number	Diff line change
`@@ -9010,11 +9010,11 @@ void QgisApp::zoomToLayerScale()`
`9010`	`9010`	`if ( layer && layer->hasScaleBasedVisibility() )`
`9011`	`9011`	`{`
`9012`	`9012`	`const double scale = mMapCanvas->scale();`
`9013`		`- if ( scale > layer->minimumScale() )`
	`9013`	`+ if ( scale > layer->minimumScale() && layer->minimumScale() > 0 )`
`9014`	`9014`	`{`
`9015`	`9015`	`mMapCanvas->zoomScale( layer->minimumScale() * Qgis::SCALE_PRECISION );`
`9016`	`9016`	`}`
`9017`		`- else if ( scale <= layer->maximumScale() )`
	`9017`	`+ else if ( scale <= layer->maximumScale() && layer->maximumScale() > 0 )`
`9018`	`9018`	`{`
`9019`	`9019`	`mMapCanvas->zoomScale( layer->maximumScale() );`
`9020`	`9020`	`}`