Fix #12050 - possible crash on launch

wonder-sk · wonder-sk · commit ffd7f8a85d12 · 2015-02-17T18:19:19.000+07:00
Do not allow infinite recursion setExtent() -&gt; setCenter() -&gt; setExtent()
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -843,6 +843,14 @@ void QgsMapCanvas::setExtent( QgsRectangle const & r )
 
   if ( r.isEmpty() )
   {
+    if ( !mSettings.hasValidSettings() )
+    {
+      // we can't even just move the map center
+      QgsDebugMsg( "Empty extent - ignoring" );
+      return;
+    }
+
+    // ### QGIS 3: do not allow empty extent - require users to call setCenter() explicitly
     QgsDebugMsg( "Empty extent - keeping old scale with new center!" );
     setCenter( r.center() );
   }

Original file line number	Diff line number	Diff line change
`@@ -843,6 +843,14 @@ void QgsMapCanvas::setExtent( QgsRectangle const & r )`
`843`	`843`
`844`	`844`	`if ( r.isEmpty() )`
`845`	`845`	`{`
	`846`	`+ if ( !mSettings.hasValidSettings() )`
	`847`	`+ {`
	`848`	`+ // we can't even just move the map center`
	`849`	`+ QgsDebugMsg( "Empty extent - ignoring" );`
	`850`	`+ return;`
	`851`	`+ }`
	`852`	`+`
	`853`	`+ // ### QGIS 3: do not allow empty extent - require users to call setCenter() explicitly`
`846`	`854`	`QgsDebugMsg( "Empty extent - keeping old scale with new center!" );`
`847`	`855`	`setCenter( r.center() );`
`848`	`856`	`}`