Stop editing before layer remove if necessary

git-svn-id: http://svn.osgeo.org/qgis/trunk@8205 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 11, 2008 · 13fafbb · 13fafbb
1 parent 6961f56
commit 13fafbb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/app/legend/qgslegendlayerfile.cpp b/src/app/legend/qgslegendlayerfile.cpp
@@ -476,6 +476,12 @@ void QgsLegendLayerFile::toggleEditing()
 
 }
 
+bool QgsLegendLayerFile::isEditing()
+{
+  QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>(mLyr.layer());
+  return vlayer && vlayer->isEditable();
+} 
+
 void QgsLegendLayerFile::layerNameChanged()
 {
   QString name = mLyr.layer()->name();

diff --git a/src/app/legend/qgslegendlayerfile.h b/src/app/legend/qgslegendlayerfile.h
@@ -89,6 +89,9 @@ class QgsLegendLayerFile : public QgsLegendItem
     /**Toggle editing for layer*/
     void toggleEditing();
 
+    /**Return editing status for layer*/
+    bool isEditing();
+
     /**Toggle show in overview*/
     void showInOverview();
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3774,6 +3774,11 @@ void QgisApp::inOverview()
 
 void QgisApp::removeLayer()
 {
+  QgsLegendLayerFile* currentLayerFile = mMapLegend->currentLayerFile();
+  if(currentLayerFile && currentLayerFile->isEditing() )
+  {
+    currentLayerFile->toggleEditing();
+  }
   mMapLegend->legendLayerRemove();
 }