fix 0d69d4c

jef-n · jef-n · commit e618f3736e1c · 2013-04-13T10:11:26.000+02:00
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 ( ( 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 );
   }

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ void QgsOgrProvider::setEncoding( const QString& e )`
`504`	`504`	`{`
`505`	`505`	`#if defined(OLCStringsAsUTF8)`
`506`	`506`	`QSettings settings;`
`507`		`- if ( ( ogrDriverName != "ESRI Shapefile" \|\| settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() ) && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )`
	`507`	`+ if ( ( ogrDriverName == "ESRI Shapefile" && settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() ) \|\| !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )`
`508`	`508`	`{`
`509`	`509`	`QgsVectorDataProvider::setEncoding( e );`
`510`	`510`	`}`