Merge pull request #39352 from m-kuhn/bad_layer_deps

Do not try to load bad layer dependencies
qgis · Oct 16, 2020 · b3066af · b3066af
2 parents 0f4270c + 0876901
commit b3066af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2284,8 +2284,8 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S
     const auto constDependencies { findBrokenLayerDependencies( vl, categories ) };
     for ( const QgsVectorLayerRef &dependency : constDependencies )
     {
-      // Temporary check for projects that were created before commit 7e8c7b3d0e094737336ff4834ea2af625d2921bf
-      if ( QgsProject::instance()->mapLayer( dependency.layerId ) )
+      // Check for projects without layer dependencies (see 7e8c7b3d0e094737336ff4834ea2af625d2921bf)
+      if ( QgsProject::instance()->mapLayer( dependency.layerId ) || ( dependency.name.isEmpty() && dependency.source.isEmpty() ) )
       {
         continue;
       }