Fix crash if undoing / redoing scale bar unit changes

qgis · Aug 13, 2012 · 9a26650 · 9a26650
1 parent 18f2c43
commit 9a26650
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp
@@ -182,10 +182,11 @@ void QgsComposerScaleBarWidget::setGuiElements()
 
   //alignment
   mAlignmentComboBox->setCurrentIndex(( int )( mComposerScaleBar->alignment() ) );
-  blockMemberSignals( false );
 
   //units
   mUnitsComboBox->setCurrentIndex( mUnitsComboBox->findData(( int )mComposerScaleBar->units() ) );
+
+  blockMemberSignals( false );
 }
 
 //slots
@@ -420,6 +421,7 @@ void QgsComposerScaleBarWidget::on_mUnitsComboBox_currentIndexChanged( int index
   {
     return;
   }
+
   mComposerScaleBar->beginCommand( tr( "Scalebar unit changed" ) );
   mComposerScaleBar->setUnits(( QgsComposerScaleBar::ScaleBarUnits )unitData.toInt() );
   mComposerScaleBar->update();