Fixed a potential bug in case someone calls QgsMapCanvas::setOverview(NULL)

wonder · wonder · commit 0de75182aab7 · 2008-06-21T17:27:28.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8667 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -319,10 +319,10 @@ void QgsMapCanvas::setOverview(QgsMapOverviewCanvas* overview)
     // map overview is not owned by map canvas so don't delete it...
   }
   
+  mMapOverview = overview;
+
   if (overview)
   {
-    mMapOverview = overview;
-  
     // connect to the map render to copy its projection settings
     connect(mMapRender, SIGNAL(projectionsEnabled(bool)),
             overview,     SLOT(projectionsEnabled(bool)));

Original file line number	Diff line number	Diff line change
`@@ -319,10 +319,10 @@ void QgsMapCanvas::setOverview(QgsMapOverviewCanvas* overview)`
`319`	`319`	`// map overview is not owned by map canvas so don't delete it...`
`320`	`320`	`}`
`321`	`321`
	`322`	`+ mMapOverview = overview;`
	`323`	`+`
`322`	`324`	`if (overview)`
`323`	`325`	`{`
`324`		`- mMapOverview = overview;`
`325`		`-`
`326`	`326`	`// connect to the map render to copy its projection settings`
`327`	`327`	`connect(mMapRender, SIGNAL(projectionsEnabled(bool)),`
`328`	`328`	`overview, SLOT(projectionsEnabled(bool)));`