delete rubber bands when exiting identify menu

3nids · 3nids · commit a41a9a38ac76 · 2014-10-23T14:45:00.000+02:00
diff --git a/python/gui/qgsidentifymenu.sip b/python/gui/qgsidentifymenu.sip
@@ -83,4 +83,7 @@ class QgsIdentifyMenu : QMenu
      * @param selectedAction if specified, this will allow to know which action has been triggered
      */
     QList<QgsMapToolIdentify::IdentifyResult> exec( const QList<QgsMapToolIdentify::IdentifyResult> idResults, QPoint pos );
+
+  protected:
+    virtual void closeEvent( QCloseEvent *e );
 };
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
@@ -151,6 +151,12 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsIdentifyMenu::exec( const QList<Qgs
   }
 }
 
+void QgsIdentifyMenu::closeEvent( QCloseEvent* e )
+{
+  deleteRubberBands();
+  QMenu::closeEvent( e );
+}
+
 void QgsIdentifyMenu::addRasterLayer( QgsMapLayer* layer )
 {
   QAction* layerAction;
diff --git a/src/gui/qgsidentifymenu.h b/src/gui/qgsidentifymenu.h
@@ -129,6 +129,9 @@ class GUI_EXPORT QgsIdentifyMenu : public QMenu
      */
     QList<QgsMapToolIdentify::IdentifyResult> exec( const QList<QgsMapToolIdentify::IdentifyResult> idResults, QPoint pos );
 
+  protected:
+    virtual void closeEvent( QCloseEvent *e );
+
   private slots:
     void handleMenuHover();
     void deleteRubberBands();

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,12 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsIdentifyMenu::exec( const QList<Qgs`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
	`154`	`+void QgsIdentifyMenu::closeEvent( QCloseEvent* e )`
	`155`	`+{`
	`156`	`+ deleteRubberBands();`
	`157`	`+ QMenu::closeEvent( e );`
	`158`	`+}`
	`159`	`+`
`154`	`160`	`void QgsIdentifyMenu::addRasterLayer( QgsMapLayer* layer )`
`155`	`161`	`{`
`156`	`162`	`QAction* layerAction;`