Fix loading of composer scalebar (ticket #6195)

qgis · Aug 14, 2012 · 778e7d7 · 778e7d7
1 parent 7f6e873
commit 778e7d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp
@@ -85,6 +85,11 @@ void QgsComposerScaleBarWidget::refreshMapComboBox()
     }
   }
 
+  if ( saveCurrentComboText.isEmpty() && mComposerScaleBar->composerMap() )
+  {
+    //combo box was not initialised before
+    mMapComboBox->setCurrentIndex( mMapComboBox->findText( tr( "Map %1" ).arg( mComposerScaleBar->composerMap()->id() ) ) );
+  }
   if ( mMapComboBox->findText( saveCurrentComboText ) == -1 )
   {
     //the former entry is no longer present. Inform the scalebar about the changed composer map

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -1121,12 +1121,6 @@ void QgsComposition::addComposerMap( QgsComposerMap* map, bool setDefaultPreview
 
 void QgsComposition::addComposerScaleBar( QgsComposerScaleBar* scaleBar )
 {
-  //take first available map
-  QList<const QgsComposerMap*> mapItemList = composerMapItems();
-  if ( mapItemList.size() > 0 )
-  {
-    scaleBar->setComposerMap( mapItemList.at( 0 ) );
-  }
   addItem( scaleBar );
   emit composerScaleBarAdded( scaleBar );
   clearSelection();