Merge pull request #2049 from Hvitnov/fix12787

wonder-sk · wonder-sk · commit c33b9fa1d5c3 · 2015-05-20T15:53:29.000+02:00
fix #12787 (Value Relation edit widget related crash)
diff --git a/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp
@@ -32,7 +32,7 @@ QgsEditorWidgetConfig QgsValueRelationConfigDlg::config()
 {
   QgsEditorWidgetConfig cfg;
 
-  cfg.insert( "Layer", mLayerName->currentLayer()->id() );
+  cfg.insert( "Layer", mLayerName->currentLayer() ? mLayerName->currentLayer()->id() : QString() );
   cfg.insert( "Key", mKeyColumn->currentField() );
   cfg.insert( "Value", mValueColumn->currentField() );
   cfg.insert( "AllowMulti", mAllowMulti->isChecked() );

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ QgsEditorWidgetConfig QgsValueRelationConfigDlg::config()`
`32`	`32`	`{`
`33`	`33`	`QgsEditorWidgetConfig cfg;`
`34`	`34`
`35`		`- cfg.insert( "Layer", mLayerName->currentLayer()->id() );`
	`35`	`+ cfg.insert( "Layer", mLayerName->currentLayer() ? mLayerName->currentLayer()->id() : QString() );`
`36`	`36`	`cfg.insert( "Key", mKeyColumn->currentField() );`
`37`	`37`	`cfg.insert( "Value", mValueColumn->currentField() );`
`38`	`38`	`cfg.insert( "AllowMulti", mAllowMulti->isChecked() );`