Skip to content

Commit b5cd5ee

Browse files
committed
don't set friendly name without sublayers (followup e0a2267; fixes #16593, #16594, #16598)
(cherry picked from commit 403dc35)
1 parent 52a9c6d commit b5cd5ee

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/app/qgisapp.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3620,11 +3620,9 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt
36203620
else if ( !sublayers.isEmpty() ) // there is 1 layer of data available
36213621
{
36223622
//set friendly name for datasources with only one layer
3623-
QStringList sublayers = layer->dataProvider()->subLayers();
36243623
QStringList elements = sublayers.at( 0 ).split( ':' );
36253624

3626-
Q_ASSERT( elements.size() >= 4 );
3627-
if ( layer->name() != elements.at( 1 ) )
3625+
if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )
36283626
{
36293627
layer->setName( QString( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
36303628
}
@@ -9310,12 +9308,14 @@ QgsVectorLayer* QgisApp::addVectorLayer( const QString& vectorLayerPath, const Q
93109308

93119309
//set friendly name for datasources with only one layer
93129310
QStringList sublayers = layer->dataProvider()->subLayers();
9313-
QStringList elements = sublayers.at( 0 ).split( ':' );
9314-
9315-
Q_ASSERT( elements.size() >= 4 );
9316-
if ( layer->name() != elements.at( 1 ) )
9311+
if ( !sublayers.isEmpty() )
93179312
{
9318-
layer->setName( QString( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
9313+
QStringList elements = sublayers.at( 0 ).split( ':' );
9314+
9315+
if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )
9316+
{
9317+
layer->setName( QString( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
9318+
}
93199319
}
93209320

93219321
myList << layer;

0 commit comments

Comments
 (0)