check menu after contextMenuAboutToShow

qgis · Mar 17, 2023 · b36bfa9 · b36bfa9
1 parent cb6d3b6
commit b36bfa9
Showing 1 changed file with 2 additions and 4 deletions.
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 )