fix crash in identify menu when closing a project with map layer actions

qgis · Sep 18, 2014 · faf4b7f · m-kuhn · Sep 18, 2014 · 3nids
1 parent 5645a18
commit faf4b7f
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
@@ -136,10 +136,23 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsIdentifyMenu::exec( const QList<Qgs
   bool externalAction;
   returnResults = results( selectedAction, externalAction );
 
+  // delete actions
+  clear();
+  // also remove the QgsActionMenu
+  QList<QgsActionMenu*> actionMenus = findChildren<QgsActionMenu*>();
+  Q_FOREACH ( QgsActionMenu* actionMenu, actionMenus )
+  {
+    delete actionMenu;
+  }
+
   if ( externalAction && !mResultsIfExternalAction )
+  {
     return QList<QgsMapToolIdentify::IdentifyResult>();
-
-  return returnResults;
+  }
+  else
+  {
+    return returnResults;
+  }
 }
 
 void QgsIdentifyMenu::addRasterLayer( QgsMapLayer* layer )
@@ -316,7 +329,7 @@ void QgsIdentifyMenu::addVectorLayer( QgsVectorLayer* layer, const QList<QgsMapT
     QList<QgsMapLayerAction*> customFeatureActions = mCustomActionRegistry.mapLayerActions( layer, QgsMapLayerAction::SingleFeature );
     if ( mShowFeatureActions )
     {
-      featureActionMenu = new QgsActionMenu( layer, &( result.mFeature ), this );
+      featureActionMenu = new QgsActionMenu( layer, &( result.mFeature ), layerMenu );
     }
 
     // feature title