Add project/layer expression context scope only if it is available

Better to leave them out than adding dummy scopes
qgis · Jan 6, 2017 · 062de6a · 062de6a
1 parent 63d1cfd
commit 062de6a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -686,9 +686,14 @@ QgsExpressionContextScope* QgsExpressionContextUtils::layerScope( const QgsMapLa
 QList<QgsExpressionContextScope*> QgsExpressionContextUtils::globalProjectLayerScopes( const QgsMapLayer* layer )
 {
   QList<QgsExpressionContextScope*> scopes;
-  scopes << globalScope()
-  << projectScope( QgsProject::instance() )  // TODO: use project associated with layer
-  << layerScope( layer );
+  scopes << globalScope();
+
+  QgsProject* project = QgsProject::instance();  // TODO: use project associated with layer
+  if ( project )
+    scopes << projectScope( project );
+
+  if ( layer )
+    scopes << layerScope( layer );
   return scopes;
 }
 

diff --git a/src/gui/symbology-ng/qgssymbolwidgetcontext.cpp b/src/gui/symbology-ng/qgssymbolwidgetcontext.cpp
@@ -93,6 +93,7 @@ QList<QgsExpressionContextScope *> QgsSymbolWidgetContext::globalProjectAtlasMap
   {
     scopes << QgsExpressionContextUtils::mapSettingsScope( QgsMapSettings() );
   }
-  scopes << QgsExpressionContextUtils::layerScope( layer );
+  if ( layer )
+    scopes << QgsExpressionContextUtils::layerScope( layer );
   return scopes;
 }