sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix overwriting default style of geopackage layers

Browse Source 
Credit to @rouault for the fix!

Fixes #42811
This commit is contained in:
Nyall Dawson 2021-09-29 11:41:13 +10:00
parent b843556719
commit eef6939b96
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/providers/ogr/qgsogrprovidermetadata.cpp
View File

@ -391,6 +391,7 @@ bool QgsOgrProviderMetadata::saveStyle(
OGR_L_SetAttributeFilter( hLayer, checkQuery.toUtf8().constData() ); OGR_L_SetAttributeFilter( hLayer, checkQuery.toUtf8().constData() );
OGR_L_ResetReading( hLayer ); OGR_L_ResetReading( hLayer );
gdal::ogr_feature_unique_ptr hFeature( OGR_L_GetNextFeature( hLayer ) ); gdal::ogr_feature_unique_ptr hFeature( OGR_L_GetNextFeature( hLayer ) );
OGR_L_ResetReading( hLayer );
bool bNew = true; bool bNew = true;
if ( hFeature ) if ( hFeature )
@ -610,6 +611,7 @@ QString QgsOgrProviderMetadata::loadStyle( const QString &uri, QString &errCause
} }
} }
OGR_L_ResetReading( hLayer );
return styleQML; return styleQML;
} }
@ -783,6 +785,7 @@ QString QgsOgrProviderMetadata::getStyleById( const QString &uri, QString styleI
QString styleQML( QString::fromUtf8( QString styleQML( QString::fromUtf8(
OGR_F_GetFieldAsString( hFeature.get(), OGR_F_GetFieldAsString( hFeature.get(),
OGR_FD_GetFieldIndex( hLayerDefn, "styleQML" ) ) ) ); OGR_FD_GetFieldIndex( hLayerDefn, "styleQML" ) ) ) );
OGR_L_ResetReading( hLayer );
return styleQML; return styleQML;
} }