Fix #7542 (crash in vector layer properties for geometryless layers)

wonder-sk · wonder-sk · commit 4306632c7414 · 2013-04-08T20:26:13.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -413,8 +413,11 @@ void QgsVectorLayerProperties::apply()
   // Apply fields settings
   mFieldsPropertiesDialog->apply();
 
-  QgsRendererV2PropertiesDialog* dlg = static_cast<QgsRendererV2PropertiesDialog*>( widgetStackRenderers->currentWidget() );
-  dlg->apply();
+  if ( layer->rendererV2() )
+  {
+    QgsRendererV2PropertiesDialog* dlg = static_cast<QgsRendererV2PropertiesDialog*>( widgetStackRenderers->currentWidget() );
+    dlg->apply();
+  }
 
   //apply diagram settings
   diagramPropertiesDialog->apply();
@@ -774,12 +777,19 @@ void QgsVectorLayerProperties::updateSymbologyPage()
   delete mRendererDialog;
   mRendererDialog = 0;
 
-  mRendererDialog = new QgsRendererV2PropertiesDialog( layer, QgsStyleV2::defaultStyle(), true );
+  if ( layer->rendererV2() )
+  {
+    mRendererDialog = new QgsRendererV2PropertiesDialog( layer, QgsStyleV2::defaultStyle(), true );
 
-  // display the menu to choose the output format (fix #5136)
-  pbnSaveStyleAs->setText( tr( "Save Style" ) );
-  pbnSaveStyleAs->setMenu( mSaveAsMenu );
-  QObject::disconnect( pbnSaveStyleAs, SIGNAL( clicked() ), this, SLOT( on_pbnSaveStyleAs_clicked() ) );
+    // display the menu to choose the output format (fix #5136)
+    pbnSaveStyleAs->setText( tr( "Save Style" ) );
+    pbnSaveStyleAs->setMenu( mSaveAsMenu );
+    QObject::disconnect( pbnSaveStyleAs, SIGNAL( clicked() ), this, SLOT( on_pbnSaveStyleAs_clicked() ) );
+  }
+  else
+  {
+    tabWidget->setTabEnabled( 0, false ); // hide symbology item
+  }
 
   if ( mRendererDialog )
   {
