Showing with 7 additions and 11 deletions.

+0 −6 src/app/legend/qgslegend.cpp

+0 −3 src/app/legend/qgslegend.h

+0 −1 src/app/legend/qgslegendlayer.cpp

+1 −1 src/core/qgsmapsettings.cpp

+6 −0 src/gui/qgsmapoverviewcanvas.cpp
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -2445,11 +2445,6 @@ void QgsLegend::updateMapCanvasLayerSet()
   mMapCanvas->setLayerSet( layers );
 }
 
-void QgsLegend::updateOverview()
-{
-  mMapCanvas->updateOverview();
-}
-
 void QgsLegend::enableOverviewModeAllLayers( bool isInOverview )
 {
   for ( QTreeWidgetItem* theItem = firstItem(); theItem; theItem = nextItem( theItem ) )
@@ -2462,7 +2457,6 @@ void QgsLegend::enableOverviewModeAllLayers( bool isInOverview )
 
   }
   updateMapCanvasLayerSet();
-  updateOverview();
 }
 
 QStringList QgsLegend::layerIDs()

diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
@@ -206,9 +206,6 @@ class QgsLegend : public QTreeWidget
     /**Updates layer set of map canvas*/
     void updateMapCanvasLayerSet();
 
-    /**Updates overview*/
-    void updateOverview();
-
     /**Show/remove all layer in/from overview*/
     void enableOverviewModeAllLayers( bool isInOverview );
 

diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -494,7 +494,6 @@ void QgsLegendLayer::showInOverview()
   setInOverview( ! isInOverview() );
 
   legend()->updateMapCanvasLayerSet();
-  legend()->updateOverview();
 }
 
 QString QgsLegendLayer::nameFromLayer( QgsMapLayer* layer )

diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -50,7 +50,7 @@ void QgsMapSettings::updateDerived()
 {
   QgsRectangle extent = mExtent;
 
-  if ( extent.isEmpty() )
+  if ( extent.isEmpty() || !extent.isFinite() )
   {
     mValid = false;
     return;

diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
@@ -257,8 +257,14 @@ void QgsMapOverviewCanvas::updatePanningWidget( const QPoint& pos )
 
 void QgsMapOverviewCanvas::refresh()
 {
+  updateFullExtent();
+
   if ( !mSettings.hasValidSettings() )
+  {
+    mPixmap = QPixmap();
+    update();
     return; // makes no sense to render anything
+  }
 
   if ( mJob )
   {