Skip to content
Permalink
Browse files

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

  • Loading branch information
jef-n committed Apr 13, 2013
1 parent 065b357 commit 0d69d4c6aed526958b62fe3a95989807ca08b0b4
Showing with 1 addition and 1 deletion.
  1. +1 −1 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 );
}

0 comments on commit 0d69d4c

Please sign in to comment.
You can’t perform that action at this time.