fix #2206

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12376 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 8, 2009 · 38d0e39 · 38d0e39
1 parent e00939b
commit 38d0e39
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
@@ -124,7 +124,8 @@ QgsIdentifyResults::QgsIdentifyResults( QgsMapCanvas *canvas, QWidget *parent, Q
 QgsIdentifyResults::~QgsIdentifyResults()
 {
   clearRubberbands();
-  delete mActionPopup;
+  if ( mActionPopup )
+    delete mActionPopup;
 }
 
 QTreeWidgetItem *QgsIdentifyResults::layerItem( QObject *layer )
@@ -290,6 +291,10 @@ void QgsIdentifyResults::show()
 // (saves the current window size/position)
 void QgsIdentifyResults::close()
 {
+  clearRubberbands();
+  delete mActionPopup;
+  mActionPopup = 0;
+
   saveWindowLocation();
   done( 0 );
 }
@@ -327,13 +332,13 @@ void QgsIdentifyResults::contextMenuEvent( QContextMenuEvent* event )
   if ( !item )
     return;
 
-  if ( mActionPopup )
-    delete mActionPopup;
-
   QgsVectorLayer *vlayer = vectorLayer( item );
   if ( vlayer == 0 )
     return;
 
+  if ( mActionPopup )
+    delete mActionPopup;
+
   mActionPopup = new QMenu();
 
   mActionPopup->addAction( vlayer->isEditable() ? tr( "Edit feature form" ) : tr( "View feature form" ), this, SLOT( featureForm() ) );