[QGIS Commit] r12376 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-08 18:10:34 -0500 (Tue, 08 Dec 2009)
New Revision: 12376

Modified:
   trunk/qgis/src/app/qgsidentifyresults.cpp
Log:
fix #2206

Modified: trunk/qgis/src/app/qgsidentifyresults.cpp
===================================================================
--- trunk/qgis/src/app/qgsidentifyresults.cpp	2009-12-08 21:17:21 UTC (rev 12375)
+++ trunk/qgis/src/app/qgsidentifyresults.cpp	2009-12-08 23:10:34 UTC (rev 12376)
@@ -124,7 +124,8 @@
 QgsIdentifyResults::~QgsIdentifyResults()
 {
   clearRubberbands();
-  delete mActionPopup;
+  if ( mActionPopup )
+    delete mActionPopup;
 }
 
 QTreeWidgetItem *QgsIdentifyResults::layerItem( QObject *layer )
@@ -290,6 +291,10 @@
 // (saves the current window size/position)
 void QgsIdentifyResults::close()
 {
+  clearRubberbands();
+  delete mActionPopup;
+  mActionPopup = 0;
+
   saveWindowLocation();
   done( 0 );
 }
@@ -327,13 +332,13 @@
   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() ) );