Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix crash when stored scale list contains invalid values
Can happen as a result of invalid settings being written by
QGIS 3.30.0
  • Loading branch information
nyalldawson committed Mar 29, 2023
1 parent 2f34f97 commit 045bf94
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/gui/qgsscalecombobox.cpp
Expand Up @@ -60,13 +60,14 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
}
}

QStringList parts;
double denominator;
bool ok;
for ( int i = 0; i < myScalesList.size(); ++i )
{
parts = myScalesList[ i ] .split( ':' );
denominator = QLocale().toDouble( parts[1], &ok );
const QStringList parts = myScalesList[ i ] .split( ':' );
if ( parts.size() < 2 )
continue;

bool ok = false;
const double denominator = QLocale().toDouble( parts[1], &ok );
if ( ok )
{
myScalesList[ i ] = toString( denominator );
Expand Down

0 comments on commit 045bf94

Please sign in to comment.