Fix repeated editing of transactiongroups

qgis · Jan 18, 2016 · c288311 · c288311
1 parent b66e50b
commit c288311
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/core/qgstransactiongroup.cpp b/src/core/qgstransactiongroup.cpp
@@ -26,14 +26,12 @@ QgsTransactionGroup::QgsTransactionGroup( QObject *parent )
     : QObject( parent )
     , mEditingStarting( false )
     , mEditingStopping( false )
-    , mTransaction( nullptr )
 {
 
 }
 
 QgsTransactionGroup::~QgsTransactionGroup()
 {
-  delete mTransaction;
 }
 
 bool QgsTransactionGroup::addLayer( QgsVectorLayer* layer )
@@ -63,10 +61,10 @@ bool QgsTransactionGroup::addLayer( QgsVectorLayer* layer )
 
 void QgsTransactionGroup::onEditingStarted()
 {
-  if ( mTransaction )
+  if ( !mTransaction.isNull() )
     return;
 
-  mTransaction = QgsTransaction::create( mConnString, mProviderKey );
+  mTransaction.reset( QgsTransaction::create( mConnString, mProviderKey ) );
 
   QString errorMsg;
   mTransaction->begin( errorMsg );
@@ -102,6 +100,8 @@ void QgsTransactionGroup::onCommitChanges()
       if ( layer != sender() )
         layer->commitChanges();
     }
+
+    disableTransaction();
   }
   else
   {
@@ -129,6 +129,7 @@ void QgsTransactionGroup::onRollback()
       if ( layer != triggeringLayer )
         layer->rollBack();
     }
+    disableTransaction();
   }
   else
   {
@@ -138,6 +139,17 @@ void QgsTransactionGroup::onRollback()
   mEditingStopping = false;
 }
 
+void QgsTransactionGroup::disableTransaction()
+{
+  mTransaction.reset();
+
+  Q_FOREACH ( QgsVectorLayer* layer, mLayers )
+  {
+    disconnect( layer, SIGNAL( beforeCommitChanges() ), this, SLOT( onCommitChanges() ) );
+    disconnect( layer, SIGNAL( beforeRollBack() ), this, SLOT( onRollback() ) );
+  }
+}
+
 QString QgsTransactionGroup::providerKey() const
 {
   return mProviderKey;

diff --git a/src/core/qgstransactiongroup.h b/src/core/qgstransactiongroup.h
@@ -70,9 +70,11 @@ class CORE_EXPORT QgsTransactionGroup : public QObject
     bool mEditingStarting;
     bool mEditingStopping;
 
+    void disableTransaction();
+
     QSet<QgsVectorLayer*> mLayers;
     //! Only set while a transaction is active
-    QgsTransaction* mTransaction;
+    QScopedPointer<QgsTransaction> mTransaction;
     //! Layers have to be compatible with the connection string
     QString mConnString;
     QString mProviderKey;