ignoreShapeEncoding should only have effect on shapes (follows up fea…

…86ea)
qgis · Apr 13, 2013 · 0d69d4c · 0d69d4c
1 parent 065b357
commit 0d69d4c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -504,7 +504,7 @@ void QgsOgrProvider::setEncoding( const QString& e )
 {
 #if defined(OLCStringsAsUTF8)
   QSettings settings;
-  if ( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
+  if ( ( ogrDriverName != "ESRI Shapefile" || settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() ) && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
   {
     QgsVectorDataProvider::setEncoding( e );
   }