Merge pull request #1083 from Oslandia/fix_max_on_joined_fields

fix bug in max value on joined fields
qgis · Jan 23, 2014 · eb92999 · eb92999
2 parents 3568fe7 + 80b44a7
commit eb92999
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -445,8 +445,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()
   //get maximum value from provider (ignoring not-commited edits)
   if ( mLayer )
   {
-    QgsVectorDataProvider* provider = mLayer->dataProvider();
-    if ( provider )
+    // condition removed, keep this useless scope to avoid screewing diff (easier to review)
     {
       float maxValue = 0;
       if ( mSizeAttributeComboBox->currentIndex() >= mAvailableAttributes )
@@ -469,7 +468,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()
       }
       else
       {
-        maxValue = provider->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toFloat();
+        maxValue = mLayer->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toFloat();
       }
       mValueLineEdit->setText( QString( "%1" ).arg( maxValue ) );
     }