Merge pull request #6930 from m-kuhn/fixSearchCrash

m-kuhn · web-flow · commit 9836dc222feb · 2018-05-04T12:03:22.000+02:00
Fix crash with uninitialized search widget
diff --git a/src/gui/qgsattributeformrelationeditorwidget.cpp b/src/gui/qgsattributeformrelationeditorwidget.cpp
@@ -39,5 +39,9 @@ void QgsAttributeFormRelationEditorWidget::createSearchWidgetWrappers( const Qgs
 
 QString QgsAttributeFormRelationEditorWidget::currentFilterExpression() const
 {
-  return mSearchWidget->expression();
+  QString filterExpression;
+  if ( mSearchWidget )
+    filterExpression = mSearchWidget->expression();
+
+  return filterExpression;
 }

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,9 @@ void QgsAttributeFormRelationEditorWidget::createSearchWidgetWrappers( const Qgs`
`39`	`39`
`40`	`40`	`QString QgsAttributeFormRelationEditorWidget::currentFilterExpression() const`
`41`	`41`	`{`
`42`		`- return mSearchWidget->expression();`
	`42`	`+ QString filterExpression;`
	`43`	`+ if ( mSearchWidget )`
	`44`	`+ filterExpression = mSearchWidget->expression();`
	`45`	`+`
	`46`	`+ return filterExpression;`
`43`	`47`	`}`