check menu after contextMenuAboutToShow

vcloarec · vcloarec · commit 31c456c1d79f · 2023-03-16T07:56:29.000-04:00
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1208,12 +1208,10 @@ void QgsMapCanvas::showContextMenu( QgsMapMouseEvent *event )
     if ( !mapTool()->populateContextMenuWithEvent( &menu, event ) )
       mMapTool->populateContextMenu( &menu );
 
-  if ( menu.isEmpty() ) // menu can be empty after populateContextMenu()
-    return;
-
   emit contextMenuAboutToShow( &menu, event );
 
-  menu.exec( event->globalPos() );
+  if ( !menu.isEmpty() ) // menu can be empty after populateContextMenu() and contextMenuAboutToShow()
+    menu.exec( event->globalPos() );
 }
 
 void QgsMapCanvas::notifyRendererErrors( const QgsMapRendererJob::Errors &errors )
