sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-19 00:07:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix encoding choice is ignored in Add Vector Layer dialog

Browse Source
This commit is contained in:
Nyall Dawson 2023-03-01 11:33:49 +10:00
parent 3c91c624c8
commit b650fbd92b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layers/qgsapplayerhandling.cpp
View File

@ -394,12 +394,6 @@ QList< QgsMapLayer * > QgsAppLayerHandling::addOgrVectorLayers( const QStringLis
QgsProject::instance()->addMapLayers( layersToAdd ); QgsProject::instance()->addMapLayers( layersToAdd );
for ( QgsMapLayer *l : std::as_const( layersToAdd ) ) for ( QgsMapLayer *l : std::as_const( layersToAdd ) )
{ {
if ( !encoding.isEmpty() )
{
if ( QgsVectorLayer *vl = qobject_cast< QgsVectorLayer * >( l ) )
vl->setProviderEncoding( encoding );
}
QgisApp::instance()->askUserForDatumTransform( l->crs(), QgsProject::instance()->crs(), l ); QgisApp::instance()->askUserForDatumTransform( l->crs(), QgsProject::instance()->crs(), l );
QgsAppLayerHandling::postProcessAddedLayer( l ); QgsAppLayerHandling::postProcessAddedLayer( l );
} }
@ -407,6 +401,16 @@ QList< QgsMapLayer * > QgsAppLayerHandling::addOgrVectorLayers( const QStringLis
ok = true; ok = true;
addedLayers.append( layersToAdd ); addedLayers.append( layersToAdd );
for ( QgsMapLayer *l : std::as_const( addedLayers ) )
{
if ( !encoding.isEmpty() )
{
if ( QgsVectorLayer *vl = qobject_cast< QgsVectorLayer * >( l ) )
vl->setProviderEncoding( encoding );
}
}
return addedLayers; return addedLayers;
} }