Skip to content

Commit

Permalink
Crash when multiple .zips are loaded via qgisapp function (fix #17184)
Browse files Browse the repository at this point in the history
Note: not just QObject::deleteLater(); see QgsDataItem::deleteLater()
  • Loading branch information
dakcarto committed Oct 6, 2017
1 parent 7935c41 commit cee7bae
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/app/qgisapp.cpp
Expand Up @@ -3708,7 +3708,7 @@ bool QgisApp::askUserForZipItemLayers( QString path )
// if 1 or 0 child found, exit so a normal item is created by gdal or ogr provider
if ( zipItem->rowCount() <= 1 )
{
delete zipItem;
zipItem->deleteLater();
return false;
}

Expand All @@ -3720,7 +3720,7 @@ bool QgisApp::askUserForZipItemLayers( QString path )
// exit if promptLayers=Never
else if ( promptLayers == 2 )
{
delete zipItem;
zipItem->deleteLater();
return false;
}
else
Expand Down Expand Up @@ -3789,7 +3789,7 @@ bool QgisApp::askUserForZipItemLayers( QString path )
}
}

delete zipItem;
zipItem->deleteLater();
return ok;
}

Expand Down

0 comments on commit cee7bae

Please sign in to comment.