fix #7982

jef-n · jef-n · commit b383c69572be · 2013-06-03T13:57:31.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -393,12 +393,13 @@ void QgsVectorLayerProperties::syncToLayer( void )
   layer->label()->setFields( layer->pendingFields() );
 
   actionDialog->init();
-  labelingDialog->init();
 
   if ( layer->hasGeometryType() )
   {
+    labelingDialog->init();
     labelDialog->init();
   }
+
   labelCheckBox->setChecked( layer->hasLabelsEnabled() );
   labelOptionsFrame->setEnabled( layer->hasLabelsEnabled() );
 

Original file line number	Diff line number	Diff line change
`@@ -393,12 +393,13 @@ void QgsVectorLayerProperties::syncToLayer( void )`
`393`	`393`	`layer->label()->setFields( layer->pendingFields() );`
`394`	`394`
`395`	`395`	`actionDialog->init();`
`396`		`- labelingDialog->init();`
`397`	`396`
`398`	`397`	`if ( layer->hasGeometryType() )`
`399`	`398`	`{`
	`399`	`+ labelingDialog->init();`
`400`	`400`	`labelDialog->init();`
`401`	`401`	`}`
	`402`	`+`
`402`	`403`	`labelCheckBox->setChecked( layer->hasLabelsEnabled() );`
`403`	`404`	`labelOptionsFrame->setEnabled( layer->hasLabelsEnabled() );`
`404`	`405`