Fix issues for mesh layer

qgis · Nov 27, 2020 · 8536b15 · 8536b15
1 parent 3677a0b
commit 8536b15
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5670,7 +5670,7 @@ QgsMeshLayer *QgisApp::addMeshLayerPrivate( const QString &url, const QString &b
         askUserForDatumTransform( newLayer->crs(), QgsProject::instance()->crs(), newLayer );
         QgsMeshLayer *meshLayer = qobject_cast<QgsMeshLayer *>( newLayer );
         if ( ! qobject_cast< QgsMeshLayerTemporalProperties * >( meshLayer->temporalProperties() )->referenceTime().isValid() )
-          qobject_cast< QgsMeshLayerTemporalProperties * >( meshLayer->temporalProperties() )->setReferenceTime( referenceTime, layer->dataProvider()->temporalCapabilities() );
+          qobject_cast< QgsMeshLayerTemporalProperties * >( meshLayer->temporalProperties() )->setReferenceTime( referenceTime, meshLayer->dataProvider()->temporalCapabilities() );
         bool ok;
         newLayer->loadDefaultStyle( ok );
         newLayer->loadDefaultMetadata( ok );

diff --git a/src/core/mesh/qgsmeshdataset.cpp b/src/core/mesh/qgsmeshdataset.cpp
@@ -656,8 +656,11 @@ void QgsMeshDatasetGroupTreeItem::setDatasetGroup( QgsMeshDatasetGroup *datasetG
     for ( const QString &varName : datasetGroupNames )
     {
       QgsMeshDatasetGroupTreeItem *varItem = searchItemBySourceName( varName );
-      varItem->mDatasetGroupDependencies.append( this->datasetGroupIndex() );
-      mDatasetGroupDependentOn.append( varItem->datasetGroupIndex() );
+      if ( varItem )
+      {
+        varItem->mDatasetGroupDependencies.append( this->datasetGroupIndex() );
+        mDatasetGroupDependentOn.append( varItem->datasetGroupIndex() );
+      }
     }
   }
 }
@@ -726,12 +729,11 @@ QList<int> QgsMeshDatasetGroupTreeItem::groupIndexDependencies() const
 
 QgsMeshDatasetGroupTreeItem *QgsMeshDatasetGroupTreeItem::searchItemBySourceName( const QString &sourceName ) const
 {
-
   QgsMeshDatasetGroupTreeItem *baseItem = rootItem();
 
   QList<QgsMeshDatasetGroupTreeItem *> itemToCheck;
   itemToCheck.append( baseItem );
-  while ( baseItem->providerName() != sourceName && !itemToCheck.isEmpty() )
+  while ( baseItem && baseItem->providerName() != sourceName && !itemToCheck.isEmpty() )
   {
     for ( int i = 0; i < baseItem->childCount(); ++i )
       itemToCheck.append( baseItem->child( i ) );