ogr provider: don't ignore set encoding if SHAPE_ENCODING is set alth…

…ough OGR still claims that strings are already UTF-8
qgis · Apr 12, 2013 · fea86ea · fea86ea · minorua · Apr 13, 2013
1 parent 95f49be
commit fea86ea
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -503,7 +503,8 @@ QStringList QgsOgrProvider::subLayers() const
 void QgsOgrProvider::setEncoding( const QString& e )
 {
 #if defined(OLCStringsAsUTF8)
-  if ( !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
+  QSettings settings;
+  if ( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
   {
     QgsVectorDataProvider::setEncoding( e );
   }