Fix crash due to index on wrong model

elpaso · elpaso · commit 0cf8a33dab44 · 2018-11-05T10:24:35.000+01:00
diff --git a/src/app/qgslayertreeviewbadlayerindicator.cpp b/src/app/qgslayertreeviewbadlayerindicator.cpp
@@ -83,7 +83,7 @@ void QgsLayerTreeViewBadLayerIndicatorProvider::onIndicatorClicked( const QModel
   {
     if ( index.isValid() )
     {
-      const QgsLayerItem *item = qobject_cast<QgsLayerItem *>( browserModel.dataItem( index ) );
+      const QgsLayerItem *item = qobject_cast<QgsLayerItem *>( proxyModel.dataItem( index ) );
       if ( item && item->mapLayerType() == layerType )
       {
         return true;
@@ -103,7 +103,7 @@ void QgsLayerTreeViewBadLayerIndicatorProvider::onIndicatorClicked( const QModel
     QModelIndex idx = browserWidget->currentIndex();
     if ( isItemCompatible( idx ) )
     {
-      const QgsDataItem *item( browserModel.dataItem( idx ) );
+      const QgsDataItem *item( proxyModel.dataItem( idx ) );
       layer->setDataSource( item->mimeUri().uri, layer->name(), item->mimeUri().providerKey, QgsDataProvider::ProviderOptions() );
       // Re-apply style
       if ( ! layer->originalXmlProperties().isEmpty() )

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void QgsLayerTreeViewBadLayerIndicatorProvider::onIndicatorClicked( const QModel`
`83`	`83`	`{`
`84`	`84`	`if ( index.isValid() )`
`85`	`85`	`{`
`86`		`- const QgsLayerItem item = qobject_cast<QgsLayerItem >( browserModel.dataItem( index ) );`
	`86`	`+ const QgsLayerItem item = qobject_cast<QgsLayerItem >( proxyModel.dataItem( index ) );`
`87`	`87`	`if ( item && item->mapLayerType() == layerType )`
`88`	`88`	`{`
`89`	`89`	`return true;`
`@@ -103,7 +103,7 @@ void QgsLayerTreeViewBadLayerIndicatorProvider::onIndicatorClicked( const QModel`
`103`	`103`	`QModelIndex idx = browserWidget->currentIndex();`
`104`	`104`	`if ( isItemCompatible( idx ) )`
`105`	`105`	`{`
`106`		`- const QgsDataItem *item( browserModel.dataItem( idx ) );`
	`106`	`+ const QgsDataItem *item( proxyModel.dataItem( idx ) );`
`107`	`107`	`layer->setDataSource( item->mimeUri().uri, layer->name(), item->mimeUri().providerKey, QgsDataProvider::ProviderOptions() );`
`108`	`108`	`// Re-apply style`
`109`	`109`	`if ( ! layer->originalXmlProperties().isEmpty() )`