Skip to content

Commit

Permalink
fix 0d69d4c
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Apr 13, 2013
1 parent 5700520 commit e618f37
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/providers/ogr/qgsogrprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down

0 comments on commit e618f37

Please sign in to comment.