Fix #4266 - georeferencer and spatial query crashing on exit

qgis · Sep 7, 2011 · f277a84 · f277a84
1 parent 871173d
commit f277a84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/plugins/georeferencer/qgsgeorefplugin.cpp b/src/plugins/georeferencer/qgsgeorefplugin.cpp
@@ -82,7 +82,8 @@ static const QString sPluginIcon = ":/icons/mGeorefRun.png";
  */
 QgsGeorefPlugin::QgsGeorefPlugin( QgisInterface * theQgisInterface ):
     QgisPlugin( sName, sDescription, sPluginVersion, sPluginType ),
-    mQGisIface( theQgisInterface )
+    mQGisIface( theQgisInterface ),
+    mPluginGui( NULL )
 {
 }
 
@@ -117,8 +118,8 @@ void QgsGeorefPlugin::initGui()
 // Slot called when the buffer menu item is triggered
 void QgsGeorefPlugin::run()
 {
-  mPluginGui = new QgsGeorefPluginGui( mQGisIface, mQGisIface->mainWindow() );
-  mPluginGui->setAttribute( Qt::WA_DeleteOnClose );
+  if ( !mPluginGui )
+    mPluginGui = new QgsGeorefPluginGui( mQGisIface, mQGisIface->mainWindow() );
   mPluginGui->show();
   mPluginGui->setFocus();
 }
@@ -133,6 +134,9 @@ void QgsGeorefPlugin::unload()
 
   delete mActionRunGeoref;
   delete mActionAbout;
+
+  delete mPluginGui;
+  mPluginGui = NULL;
 }
 
 //! Set icons to the current theme

diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.cpp b/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
@@ -100,6 +100,8 @@ void QgsSpatialQueryPlugin::unload()
 
   delete mSpatialQueryAction;
 
+  delete mDialog;
+  mDialog = NULL;
 }
 
 void QgsSpatialQueryPlugin::run()