Merge pull request #678 from minorua/ogr_init_enc_chk

borysiasty · borysiasty · commit 2d6c92b82b9a · 2013-06-26T01:26:29.000-07:00
OgrProvider: initial encoding setting check (fix #8167)
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -335,6 +335,9 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
     ogrLayer = ogrOrigLayer;
     if ( ogrLayer )
     {
+      // check that the initial encoding setting is fit for this layer
+      setEncoding( encoding() );
+
       valid = setSubsetString( mSubsetString );
       QgsDebugMsg( "Data source is valid" );
     }

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,9 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`335`	`335`	`ogrLayer = ogrOrigLayer;`
`336`	`336`	`if ( ogrLayer )`
`337`	`337`	`{`
	`338`	`+ // check that the initial encoding setting is fit for this layer`
	`339`	`+ setEncoding( encoding() );`
	`340`	`+`
`338`	`341`	`valid = setSubsetString( mSubsetString );`
`339`	`342`	`QgsDebugMsg( "Data source is valid" );`
`340`	`343`	`}`