From f6aecd152d367ed0a4cf661c3c5c8c1850f608af Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 30 Oct 2018 10:14:24 +1000 Subject: [PATCH] Avoid crash in style model when adding symbols with a new tag to library Fixes #20256 --- src/core/symbology/qgsstylemodel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/symbology/qgsstylemodel.cpp b/src/core/symbology/qgsstylemodel.cpp index d0603bacfac..75551132cf9 100644 --- a/src/core/symbology/qgsstylemodel.cpp +++ b/src/core/symbology/qgsstylemodel.cpp @@ -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