Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix unreported crash when an empty scale is in the settings (#52511)
  • Loading branch information
elpaso committed Apr 5, 2023
1 parent c3fb3d6 commit ca6df18
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/app/options/qgsoptions.cpp
Expand Up @@ -813,7 +813,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
const QStringList scalePaths = QgsSettingsRegistryCore::settingsMapScales->value();
for ( const QString &scale : scalePaths )
{
addScaleToScaleList( scale );
if ( ! scale.isEmpty() )
{
addScaleToScaleList( scale );
}
}

connect( mListGlobalScales, &QListWidget::itemChanged, this, &QgsOptions::scaleItemChanged );
Expand Down
14 changes: 12 additions & 2 deletions src/gui/qgsscalecombobox.cpp
Expand Up @@ -55,6 +55,8 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
}
}

QStringList myCleanedScalesList;

for ( int i = 0; i < myScalesList.size(); ++i )
{
const QStringList parts = myScalesList[ i ] .split( ':' );
Expand All @@ -65,13 +67,21 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
const double denominator = QLocale().toDouble( parts[1], &ok );
if ( ok )
{
myScalesList[ i ] = toString( denominator );
myCleanedScalesList.push_back( toString( denominator ) );
}
else
{
const double denominator = parts[1].toDouble( &ok );
if ( ok )
{
myCleanedScalesList.push_back( toString( denominator ) );
}
}
}

blockSignals( true );
clear();
addItems( myScalesList );
addItems( myCleanedScalesList );
setScaleString( oldScale );
blockSignals( false );
}
Expand Down

0 comments on commit ca6df18

Please sign in to comment.