sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix QgsProjectLayerGroupDialog with qgz project

Browse Source 
Maybe also fix #20134 - crash when trying to set exluded layer in QGIS Server WMS capabilities

I could not reproduce the crash but
QgsProjectLayerGroupDialog was broken
and it was probably the root of the
crash.
This commit is contained in:
Alessandro Pasotti 2018-10-23 20:19:19 +02:00
parent a42bf80185
commit 6b917e09e1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/qgsprojectlayergroupdialog.cpp
View File

@ -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 errorMesssage;
int errorLine;
if ( !projectDom.setContent( &projectFile, &errorMesssage, &errorLine ) )
{
QgsDebugMsg( QStringLiteral( "Error reading the project file %1 at line %2: %3" )
.arg( projectFile.fileName() )
.arg( errorLine )
.arg( errorMesssage ) );
return;
}
mRootGroup->removeAllChildren();
QDomElement layerTreeElem = projectDom.documentElement().firstChildElement( QStringLiteral( "layer-tree-group" ) );