Merge pull request #6667 from slarosa/fix_18530

slarosa · web-flow · commit 2220a6eadd71 · 2018-03-24T12:30:07.000+01:00
Fixes #18530: Removing project item from Welcome screen crashes QGIS
diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
@@ -201,6 +201,9 @@ QVariant QgsWelcomePageItemsModel::data( const QModelIndex &index, int role ) co
 
 Qt::ItemFlags QgsWelcomePageItemsModel::flags( const QModelIndex &index ) const
 {
+  if ( !index.isValid() || !rowCount( index.parent() ) )
+    return Qt::NoItemFlags;
+
   Qt::ItemFlags flags = QAbstractListModel::flags( index );
 
   const RecentProjectData &projectData = mRecentProjects.at( index.row() );

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,9 @@ QVariant QgsWelcomePageItemsModel::data( const QModelIndex &index, int role ) co`
`201`	`201`
`202`	`202`	`Qt::ItemFlags QgsWelcomePageItemsModel::flags( const QModelIndex &index ) const`
`203`	`203`	`{`
	`204`	`+ if ( !index.isValid() \|\| !rowCount( index.parent() ) )`
	`205`	`+ return Qt::NoItemFlags;`
	`206`	`+`
`204`	`207`	`Qt::ItemFlags flags = QAbstractListModel::flags( index );`
`205`	`208`
`206`	`209`	`const RecentProjectData &projectData = mRecentProjects.at( index.row() );`