sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crash in style model when adding symbols with a new tag to library

Browse Source 
Fixes #20256
This commit is contained in:
Nyall Dawson 2018-10-30 10:14:24 +10:00
parent 5ebb974569
commit f6aecd152d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/symbology/qgsstylemodel.cpp
View File

@ -57,8 +57,8 @@ QVariant QgsStyleModel::data( const QModelIndex &index, int role ) const
const bool isColorRamp = index.row() >= mStyle->symbolCount(); const bool isColorRamp = index.row() >= mStyle->symbolCount();
const QString name = !isColorRamp const QString name = !isColorRamp
? mSymbolNames.at( index.row() ) ? mSymbolNames.value( index.row() )
: mRampNames.at( index.row() - mSymbolNames.size() ); : mRampNames.value( index.row() - mSymbolNames.size() );
switch ( role ) switch ( role )
{ {
@ -187,8 +187,8 @@ bool QgsStyleModel::setData( const QModelIndex &index, const QVariant &value, in
{ {
const bool isColorRamp = index.row() >= mStyle->symbolCount(); const bool isColorRamp = index.row() >= mStyle->symbolCount();
const QString name = !isColorRamp const QString name = !isColorRamp
? mSymbolNames.at( index.row() ) ? mSymbolNames.value( index.row() )
: mRampNames.at( index.row() - mSymbolNames.size() ); : mRampNames.value( index.row() - mSymbolNames.size() );
const QString newName = value.toString(); const QString newName = value.toString();
return isColorRamp return isColorRamp