Fix crash when searching in layer properties

nyalldawson · nyalldawson · commit 4ffed0f921cc · 2019-04-05T14:42:29.000+10:00
Fixes #21769 (cherry picked from commit 037a828)
diff --git a/src/gui/qgsoptionsdialoghighlightwidgetsimpl.cpp b/src/gui/qgsoptionsdialoghighlightwidgetsimpl.cpp
@@ -209,7 +209,7 @@ QgsOptionsDialogHighlightTree::QgsOptionsDialogHighlightTree( QTreeView *treeVie
 
 bool QgsOptionsDialogHighlightTree::searchText( const QString &text )
 {
-  if ( !mTreeView )
+  if ( !mTreeView || !mTreeView->model() )
     return false;
   QModelIndexList hits = mTreeView->model()->match( mTreeView->model()->index( 0, 0 ), Qt::DisplayRole, text, 1, Qt::MatchContains | Qt::MatchRecursive );
   return !hits.isEmpty();

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ QgsOptionsDialogHighlightTree::QgsOptionsDialogHighlightTree( QTreeView *treeVie`
`209`	`209`
`210`	`210`	`bool QgsOptionsDialogHighlightTree::searchText( const QString &text )`
`211`	`211`	`{`
`212`		`- if ( !mTreeView )`
	`212`	`+ if ( !mTreeView \|\| !mTreeView->model() )`
`213`	`213`	`return false;`
`214`	`214`	`QModelIndexList hits = mTreeView->model()->match( mTreeView->model()->index( 0, 0 ), Qt::DisplayRole, text, 1, Qt::MatchContains \| Qt::MatchRecursive );`
`215`	`215`	`return !hits.isEmpty();`