Fix for #1712.

git-svn-id: http://svn.osgeo.org/qgis/trunk@11185 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 27, 2009 · 1e53f58 · 1e53f58
1 parent 47bc7b6
commit 1e53f58
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -35,6 +35,7 @@
 #include "qgsrubberband.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
+#include "qgsmaplayerregistry.h"
 
 #include <QAction>
 #include <QFileInfo>
@@ -57,7 +58,7 @@ static const QString pluginVersion = QObject::tr( "Version 0.1" );
  * @param theQgisInterFace Pointer to the QGIS interface object
  */
 QgsGrassPlugin::QgsGrassPlugin( QgisInterface * theQgisInterFace ):
-    qGisInterface( theQgisInterFace )
+    qGisInterface( theQgisInterFace ), mEdit(NULL), mTools(NULL)
 {
   /** Initialize the plugin and set the required attributes */
   pluginNameQString = tr( "GrassVector" );
@@ -68,6 +69,7 @@ QgsGrassPlugin::QgsGrassPlugin( QgisInterface * theQgisInterFace ):
 QgsGrassPlugin::~QgsGrassPlugin()
 {
   if ( mTools ) mTools->closeTools();
+  if ( mEdit ) mEdit->closeEdit();
   QString err = QgsGrass::closeMapset();
 }
 
@@ -411,18 +413,21 @@ void QgsGrassPlugin::edit()
   }
 
   mEditAction->setEnabled( false );
-  QgsGrassEdit *ed = new QgsGrassEdit( qGisInterface, qGisInterface->activeLayer(), false,
+  mEdit = new QgsGrassEdit( qGisInterface, qGisInterface->activeLayer(), false,
                                        qGisInterface->mainWindow(), Qt::Dialog );
 
-  if ( ed->isValid() )
+  if ( mEdit->isValid() )
   {
-    ed->show();
+    mEdit->show();
     mCanvas->refresh();
-    connect( ed, SIGNAL( finished() ), this, SLOT( setEditAction() ) );
-  }
+    connect( mEdit, SIGNAL( finished() ), this, SLOT( setEditAction() ) );
+    connect( mEdit, SIGNAL(finished()), this, SLOT(cleanUp()));
+    connect( QgsMapLayerRegistry::instance(), SIGNAL(layerWillBeRemoved(QString)), this, SLOT(closeEdit(QString)));
+    }
   else
   {
-    delete ed;
+    delete mEdit;
+    mEdit = NULL;
     mEditAction->setEnabled( true );
   }
 }
@@ -443,6 +448,18 @@ void QgsGrassPlugin::setEditAction()
   }
 }
 
+void QgsGrassPlugin::closeEdit(QString layerId)
+{
+    if(mEdit->layer()->getLayerID() == layerId){
+        mEdit->closeEdit();
+    }
+}
+
+void QgsGrassPlugin::cleanUp()
+{
+    disconnect( QgsMapLayerRegistry::instance(), SIGNAL(layerWillBeRemoved(QString)), this, SLOT(closeEdit(QString)));
+}
+
 void QgsGrassPlugin::newVector()
 {
 // QgsDebugMsg("entered.");

diff --git a/src/plugins/grass/qgsgrassplugin.h b/src/plugins/grass/qgsgrassplugin.h
@@ -23,6 +23,7 @@
 class QgsGrassTools;
 class QgsGrassNewMapset;
 class QgsGrassRegion;
+class QgsGrassEdit;
 
 class QgsMapCanvas;
 class QgsRubberBand;
@@ -118,6 +119,10 @@ class QgsGrassPlugin: public QObject, public QgisPlugin
     void saveMapset();
     //! Set edit action
     void setEditAction();
+    //! Close the edit if layer is removed
+    void closeEdit(QString layerId);
+    //! Cleanup the Grass Edit
+    void cleanUp();
     //! update plugin icons when the app tells us its theme is changed
     void setCurrentTheme( QString theThemeName );
   private:
@@ -148,6 +153,7 @@ class QgsGrassPlugin: public QObject, public QgisPlugin
     QgsGrassTools *mTools;
     //! Pointer to QgsGrassNewMapset
     QgsGrassNewMapset *mNewMapset;
+    QgsGrassEdit *mEdit;
 
     // Actions
     QAction *mOpenMapsetAction;