Fix reloading project with embedded layers from qgz

qgis · Nov 18, 2019 · 9a9778a · 9a9778a
1 parent e5eb23e
commit 9a9778a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -11597,13 +11597,6 @@ void QgisApp::embedLayers()
 
     QString projectFile = d.selectedProjectFile();
 
-    QgsProjectArchive archive;
-    if ( projectFile.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
-    {
-      archive.unzip( projectFile );
-      projectFile = archive.projectFile();
-    }
-
     //groups
     QStringList groups = d.selectedGroups();
     QStringList::const_iterator groupIt = groups.constBegin();

diff --git a/src/core/qgslayerdefinition.cpp b/src/core/qgslayerdefinition.cpp
@@ -442,8 +442,16 @@ QgsLayerDefinition::DependencySorter::DependencySorter( const QString &fileName
   : mHasCycle( false )
   , mHasMissingDependency( false )
 {
+  QString qgsProjectFile = fileName;
+  QgsProjectArchive archive;
+  if ( fileName.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
+  {
+    archive.unzip( fileName );
+    qgsProjectFile = archive.projectFile();
+  }
+
   QDomDocument doc;
-  QFile pFile( fileName );
+  QFile pFile( qgsProjectFile );
   ( void )pFile.open( QIODevice::ReadOnly );
   ( void )doc.setContent( &pFile );
   init( doc );

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2475,13 +2475,21 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
   static QDateTime sPrevProjectFileTimestamp;
   static QDomDocument sProjectDocument;
 
+  QString qgsProjectFile = projectFilePath;
+  QgsProjectArchive archive;
+  if ( projectFilePath.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
+  {
+    archive.unzip( projectFilePath );
+    qgsProjectFile = archive.projectFile();
+  }
+
   QDateTime projectFileTimestamp = QFileInfo( projectFilePath ).lastModified();
 
   if ( projectFilePath != sPrevProjectFilePath || projectFileTimestamp != sPrevProjectFileTimestamp )
   {
     sPrevProjectFilePath.clear();
 
-    QFile projectFile( projectFilePath );
+    QFile projectFile( qgsProjectFile );
     if ( !projectFile.open( QIODevice::ReadOnly ) )
     {
       return false;