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

Fixes #20256
This commit is contained in:
Nyall Dawson 2018-10-30 10:14:24 +10:00
parent 5ebb974569
commit f6aecd152d

View File

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