From b650fbd92b4298051765540263c8fde98d395e0c Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 1 Mar 2023 11:33:49 +1000
Subject: [PATCH] Fix encoding choice is ignored in Add Vector Layer dialog

---
 src/app/layers/qgsapplayerhandling.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/app/layers/qgsapplayerhandling.cpp b/src/app/layers/qgsapplayerhandling.cpp
index 94550a4e68b..c6127d85db0 100644
--- a/src/app/layers/qgsapplayerhandling.cpp
+++ b/src/app/layers/qgsapplayerhandling.cpp
@@ -394,12 +394,6 @@ QList< QgsMapLayer * > QgsAppLayerHandling::addOgrVectorLayers( const QStringLis
   QgsProject::instance()->addMapLayers( 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 );
     QgsAppLayerHandling::postProcessAddedLayer( l );
   }
@@ -407,6 +401,16 @@ QList< QgsMapLayer * > QgsAppLayerHandling::addOgrVectorLayers( const QStringLis
 
   ok = true;
   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;
 }