fix #6502

jef-n · jef-n · commit 2d0229e09698 · 2012-10-14T11:29:16.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -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
   }
@@ -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
@@ -749,7 +752,8 @@ void QgsVectorLayerProperties::apply()
 
   actionDialog->apply();
 
-  labelDialog->apply();
+  if ( labelDialog )
+    labelDialog->apply();
   layer->enableLabels( labelCheckBox->isChecked() );
   layer->setLayerName( displayName() );
 

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
	`129`	`+ labelingDialog = 0;`
	`130`	`+ labelDialog = 0;`
`129`	`131`	`tabWidget->setTabEnabled( 1, false ); // hide labeling item`
`130`	`132`	`tabWidget->setTabEnabled( 2, false ); // hide labeling (deprecated) item`
`131`	`133`	`}`
`@@ -705,7 +707,8 @@ QgsVectorLayer::EditType QgsVectorLayerProperties::editTypeFromButtonText( QStri`
`705`	`707`
`706`	`708`	`void QgsVectorLayerProperties::apply()`
`707`	`709`	`{`
`708`		`- labelingDialog->apply();`
	`710`	`+ if ( labelingDialog )`
	`711`	`+ labelingDialog->apply();`
`709`	`712`
`710`	`713`	`//`
`711`	`714`	`// Set up sql subset query if applicable`
`@@ -749,7 +752,8 @@ void QgsVectorLayerProperties::apply()`
`749`	`752`
`750`	`753`	`actionDialog->apply();`
`751`	`754`
`752`		`- labelDialog->apply();`
	`755`	`+ if ( labelDialog )`
	`756`	`+ labelDialog->apply();`
`753`	`757`	`layer->enableLabels( labelCheckBox->isChecked() );`
`754`	`758`	`layer->setLayerName( displayName() );`
`755`	`759`