[ogr] do not crash if ogr layer is null

qgis · Nov 5, 2018 · 7bbd1ca · 7bbd1ca
1 parent 147608e
commit 7bbd1ca
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -892,15 +892,16 @@ QStringList QgsOgrProvider::_subLayers( bool withFeatureCount )  const
 void QgsOgrProvider::setEncoding( const QString &e )
 {
   QgsSettings settings;
-  if ( ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) && settings.value( QStringLiteral( "qgis/ignoreShapeEncoding" ), true ).toBool() ) || !mOgrLayer->TestCapability( OLCStringsAsUTF8 ) )
+  if ( ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) &&
+         settings.value( QStringLiteral( "qgis/ignoreShapeEncoding" ), true ).toBool() ) ||
+       ( mOgrLayer && !mOgrLayer->TestCapability( OLCStringsAsUTF8 ) ) )
   {
     QgsVectorDataProvider::setEncoding( e );
   }
   else
   {
     QgsVectorDataProvider::setEncoding( QStringLiteral( "UTF-8" ) );
   }
-
   loadFields();
 }