close tools when mapset changed

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5197 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 6, 2006 · e204157 · e204157
1 parent 47ce15f
commit e204157
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -1264,6 +1264,10 @@ QgsGrassModule::~QgsGrassModule()
     #ifdef QGISDEBUG
     std::cerr << "QgsGrassModule::~QgsGrassModule()" << std::endl;
     #endif
+    if ( mProcess.state() == QProcess::Running ) 
+    {
+	mProcess.kill();
+    }
 }
 
 QDomNode QgsGrassModule::nodeByKey ( QDomElement elem, QString key )

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -96,6 +96,7 @@ QgsGrassPlugin::QgsGrassPlugin(QgisApp * theQGisApp, QgisIface * theQgisInterFac
 
 QgsGrassPlugin::~QgsGrassPlugin()
 {
+    if ( mTools ) mTools->closeTools();
     QString err = QgsGrass::closeMapset();
 }
 
@@ -238,6 +239,8 @@ void QgsGrassPlugin::initGui()
 
 void QgsGrassPlugin::mapsetChanged ()
 {
+    if ( mTools ) mTools->closeTools();
+
     if ( !QgsGrass::activeMode() )  {
         mOpenToolsAction->setEnabled(false);
 	mRegionAction->setEnabled(false);

diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -454,5 +454,6 @@ void QgsGrassTools::closeTools()
     for ( int i = mTabWidget->count()-1; i > 1; i-- )
     {
          delete mTabWidget->widget(i);
+         mTabWidget->removeTab(i);
     }
 }