Merge pull request #8291 from elpaso/bugfix-20134-maybe

Fix QgsProjectLayerGroupDialog with qgz project
qgis · Oct 24, 2018 · 1ab7dec · 1ab7dec
2 parents 8e4d5d5 + be92b21
commit 1ab7dec
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp
@@ -168,38 +168,43 @@ void QgsProjectLayerGroupDialog::changeProjectFile()
     return;
   }
 
+  std::unique_ptr<QgsProjectArchive> archive;
+
   QDomDocument projectDom;
   if ( QgsZipUtils::isZipFile( mProjectFileWidget->filePath() ) )
   {
-    QgsProjectArchive archive;
+
+    archive = qgis::make_unique<QgsProjectArchive>();
 
     // unzip the archive
-    if ( !archive.unzip( mProjectFileWidget->filePath() ) )
+    if ( !archive->unzip( mProjectFileWidget->filePath() ) )
     {
       return;
     }
 
     // test if zip provides a .qgs file
-    if ( archive.projectFile().isEmpty() )
+    if ( archive->projectFile().isEmpty() )
     {
       return;
     }
 
-    projectFile.setFileName( archive.projectFile() );
+    projectFile.setFileName( archive->projectFile() );
     if ( !projectFile.exists() )
     {
       return;
     }
   }
-
-  if ( !projectDom.setContent( &projectFile ) )
+  QString errorMessage;
+  int errorLine;
+  if ( !projectDom.setContent( &projectFile, &errorMessage, &errorLine ) )
   {
+    QgsDebugMsg( QStringLiteral( "Error reading the project file %1 at line %2: %3" )
+                 .arg( projectFile.fileName() )
+                 .arg( errorLine )
+                 .arg( errorMessage ) );
     return;
   }
 
-
-
-
   mRootGroup->removeAllChildren();
 
   QDomElement layerTreeElem = projectDom.documentElement().firstChildElement( QStringLiteral( "layer-tree-group" ) );