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

Fixes #20256
qgis · Oct 30, 2018 · f6aecd1 · f6aecd1
1 parent 5ebb974
commit f6aecd1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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