fix crash because of uninitialized widget

signedav · signedav · commit 3d7cc160d4a3 · 2019-04-11T11:42:45.000+02:00
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -643,17 +643,20 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
 
   mWMSMaxAtlasFeaturesSpinBox->setValue( QgsProject::instance()->readNumEntry( QStringLiteral( "WMSMaxAtlasFeatures" ), QStringLiteral( "/" ), 1 ) );
 
+  mWMSDefaultMapUnitsPerMm = new QDoubleSpinBox();
+  mWMSDefaultMapUnitsPerMm->setDecimals( 3 );
+  mWMSDefaultMapUnitsPerMm->setValue( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) );
+
+  //care for map units mm, km, inches etc...
+  mWMSDefaultMapUnitScale = new QgsScaleWidget();
+  mWMSDefaultMapUnitScale->setScale( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) * 1000 );
+
   if ( QgsProject::instance()->crs().isGeographic() )
   {
-    mWMSDefaultMapUnitsPerMm = new QDoubleSpinBox();
-    mWMSDefaultMapUnitsPerMm->setValue( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) );
     mWMSDefaultMapUnitsPerMmLayout->addWidget( mWMSDefaultMapUnitsPerMm );
   }
   else
   {
-    //care for map units mm, km, inches etc...
-    mWMSDefaultMapUnitScale = new QgsScaleWidget();
-    mWMSDefaultMapUnitScale->setScale( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) * 10000 );
     mWMSDefaultMapUnitsPerMmLayout->addWidget( mWMSDefaultMapUnitScale );
   }
 
@@ -1321,8 +1324,9 @@ void QgsProjectProperties::apply()
   }
   else
   {
-    defaultMapUnitsPerMm = mWMSDefaultMapUnitScale->scale() / 10000;
+    defaultMapUnitsPerMm = mWMSDefaultMapUnitScale->scale() / 1000;
   }
+
   QgsProject::instance()->writeEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), defaultMapUnitsPerMm );
 
   QgsProject::instance()->writeEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), mWMTSUrlLineEdit->text() );

Original file line number	Diff line number	Diff line change
`@@ -643,17 +643,20 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas mapCanvas, QWidget pa`
`643`	`643`
`644`	`644`	`mWMSMaxAtlasFeaturesSpinBox->setValue( QgsProject::instance()->readNumEntry( QStringLiteral( "WMSMaxAtlasFeatures" ), QStringLiteral( "/" ), 1 ) );`
`645`	`645`
	`646`	`+ mWMSDefaultMapUnitsPerMm = new QDoubleSpinBox();`
	`647`	`+ mWMSDefaultMapUnitsPerMm->setDecimals( 3 );`
	`648`	`+ mWMSDefaultMapUnitsPerMm->setValue( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) );`
	`649`	`+`
	`650`	`+ //care for map units mm, km, inches etc...`
	`651`	`+ mWMSDefaultMapUnitScale = new QgsScaleWidget();`
	`652`	`+ mWMSDefaultMapUnitScale->setScale( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) * 1000 );`
	`653`	`+`
`646`	`654`	`if ( QgsProject::instance()->crs().isGeographic() )`
`647`	`655`	`{`
`648`		`- mWMSDefaultMapUnitsPerMm = new QDoubleSpinBox();`
`649`		`- mWMSDefaultMapUnitsPerMm->setValue( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) );`
`650`	`656`	`mWMSDefaultMapUnitsPerMmLayout->addWidget( mWMSDefaultMapUnitsPerMm );`
`651`	`657`	`}`
`652`	`658`	`else`
`653`	`659`	`{`
`654`		`- //care for map units mm, km, inches etc...`
`655`		`- mWMSDefaultMapUnitScale = new QgsScaleWidget();`
`656`		`- mWMSDefaultMapUnitScale->setScale( QgsProject::instance()->readDoubleEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), 1 ) * 10000 );`
`657`	`660`	`mWMSDefaultMapUnitsPerMmLayout->addWidget( mWMSDefaultMapUnitScale );`
`658`	`661`	`}`
`659`	`662`
`@@ -1321,8 +1324,9 @@ void QgsProjectProperties::apply()`
`1321`	`1324`	`}`
`1322`	`1325`	`else`
`1323`	`1326`	`{`
`1324`		`- defaultMapUnitsPerMm = mWMSDefaultMapUnitScale->scale() / 10000;`
	`1327`	`+ defaultMapUnitsPerMm = mWMSDefaultMapUnitScale->scale() / 1000;`
`1325`	`1328`	`}`
	`1329`	`+`
`1326`	`1330`	`QgsProject::instance()->writeEntry( QStringLiteral( "WMSDefaultMapUnitsPerMm" ), QStringLiteral( "/" ), defaultMapUnitsPerMm );`
`1327`	`1331`
`1328`	`1332`	`QgsProject::instance()->writeEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), mWMTSUrlLineEdit->text() );`