[GRASS] start/close edit fixes

Author: blazek

src/providers/grass/qgsgrassprovider.cpp

@@ -585,13 +585,15 @@ bool QgsGrassProvider::closeEdit( bool newMap, QgsVectorLayer *vectorLayer )
 
   mEditBuffer = 0;
   mEditLayer = 0;
+  mLayer->closeEdit();
   if ( mLayer->map()->closeEdit( newMap ) )
   {
     loadMapInfo();
     if ( vectorLayer )
     {
       vectorLayer->updateFields();
     }
+    connect( mLayer->map(), SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
     return true;
   }
   return false;
@@ -1006,7 +1008,10 @@ void QgsGrassProvider::startEditing( QgsVectorLayer *vectorLayer )
     return;
   }
 
+  // disconnect dataChanged() because the changes are done here and we know about them
+  disconnect( mLayer->map(), SIGNAL( dataChanged() ), this, SLOT( onDataChanged() ) );
   mLayer->map()->startEdit();
+  mLayer->startEdit();
 
   mEditBuffer = vectorLayer->editBuffer();
   connect( mEditBuffer, SIGNAL( featureAdded( QgsFeatureId ) ), SLOT( onFeatureAdded( QgsFeatureId ) ) );

src/providers/grass/qgsgrassvectormap.cpp

@@ -283,11 +283,6 @@ bool QgsGrassVectorMap::startEdit()
 
   mIsEdited = true;
 
-  Q_FOREACH ( QgsGrassVectorMapLayer *l, mLayers )
-  {
-    l->startEdit();
-  }
-
   mValid = true;
   printDebug();
 
@@ -312,10 +307,6 @@ bool QgsGrassVectorMap::closeEdit( bool newMap )
   closeAllIterators(); // blocking
 
   QgsGrass::lock();
-  Q_FOREACH ( QgsGrassVectorMapLayer *l, mLayers )
-  {
-    l->closeEdit();
-  }
 
   mOldLids.clear();
   mNewLids.clear();
@@ -383,6 +374,10 @@ QgsGrassVectorMapLayer * QgsGrassVectorMap::openLayer( int field )
     {
       QgsDebugMsg( "Layer exists" );
       layer = l;
+      if ( layer->userCount() == 0 )
+      {
+        layer->load();
+      }
     }
   }
 

src/providers/grass/qgsgrassvectormaplayer.cpp

@@ -475,6 +475,7 @@ void QgsGrassVectorMapLayer::closeEdit()
   if ( mDriver )
   {
     db_close_database_shutdown_driver( mDriver );
+    mDriver = 0;
   }
 }