Skip to content
Permalink
Browse files

fix 0d69d4c

  • Loading branch information
jef-n committed Apr 13, 2013
1 parent 5700520 commit e618f3736e1c1c49cb455e73e2c23ae3b40fb117
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 ( ( ogrDriverName != "ESRI Shapefile" || 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 e618f37

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