QgsLayoutUtils::predefinedScales(): avoid potential nullptr dereference

qgis · Jul 22, 2021 · 1233c89 · 1233c89
1 parent 2107733
commit 1233c89
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/core/layout/qgslayoututils.cpp b/src/core/layout/qgslayoututils.cpp
@@ -512,11 +512,12 @@ double QgsLayoutUtils::mmToPoints( const double mmSize )
 
 QVector< double > QgsLayoutUtils::predefinedScales( const QgsLayout *layout )
 {
+  QgsProject *lProject = layout->project();
   QVector< double > mapScales;
-  if ( layout->project() )
-    mapScales = layout->project()->viewSettings()->mapScales();
+  if ( lProject )
+    mapScales = lProject->viewSettings()->mapScales();
 
-  bool hasProjectScales( layout->project()->viewSettings()->useProjectScales() );
+  bool hasProjectScales( lProject ? lProject->viewSettings()->useProjectScales() : false );
   if ( !hasProjectScales || mapScales.isEmpty() )
   {
     // default to global map tool scales