Merge pull request #3196 from nirvn/fix_right_click

nyalldawson · web-flow · commit 1d6dfc5aedd5 · 2016-06-12T15:12:42.000+10:00
[bugfix] fix crash when right-clicking on geometryless layers
diff --git a/src/app/qgsapplayertreeviewmenuprovider.cpp b/src/app/qgsapplayertreeviewmenuprovider.cpp
@@ -148,7 +148,7 @@ QMenu* QgsAppLayerTreeViewMenuProvider::createContextMenu()
         if ( vlayer )
         {
           const QgsSingleSymbolRendererV2* singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2() );
-          if ( !singleRenderer && vlayer->rendererV2()->embeddedRenderer() )
+          if ( !singleRenderer && vlayer->rendererV2() && vlayer->rendererV2()->embeddedRenderer() )
           {
             singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2()->embeddedRenderer() );
           }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ QMenu* QgsAppLayerTreeViewMenuProvider::createContextMenu()`
`148`	`148`	`if ( vlayer )`
`149`	`149`	`{`
`150`	`150`	`const QgsSingleSymbolRendererV2* singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2() );`
`151`		`- if ( !singleRenderer && vlayer->rendererV2()->embeddedRenderer() )`
	`151`	`+ if ( !singleRenderer && vlayer->rendererV2() && vlayer->rendererV2()->embeddedRenderer() )`
`152`	`152`	`{`
`153`	`153`	`singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2()->embeddedRenderer() );`
`154`	`154`	`}`