Skip to content

Commit

Permalink
fix #6502
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 14, 2012
1 parent 813f1bd commit 2d0229e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -126,6 +126,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
}
else
{
labelingDialog = 0;
labelDialog = 0;
tabWidget->setTabEnabled( 1, false ); // hide labeling item
tabWidget->setTabEnabled( 2, false ); // hide labeling (deprecated) item
}
Expand Down Expand Up @@ -705,7 +707,8 @@ QgsVectorLayer::EditType QgsVectorLayerProperties::editTypeFromButtonText( QStri

void QgsVectorLayerProperties::apply()
{
labelingDialog->apply();
if ( labelingDialog )
labelingDialog->apply();

//
// Set up sql subset query if applicable
Expand Down Expand Up @@ -749,7 +752,8 @@ void QgsVectorLayerProperties::apply()

actionDialog->apply();

labelDialog->apply();
if ( labelDialog )
labelDialog->apply();
layer->enableLabels( labelCheckBox->isChecked() );
layer->setLayerName( displayName() );

Expand Down

0 comments on commit 2d0229e

Please sign in to comment.