[QGIS Commit] r15700 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-04-14 12:09:27 -0700 (Thu, 14 Apr 2011)
New Revision: 15700

Modified:
   trunk/qgis/src/core/qgsvectorlayerjoinbuffer.cpp
Log:
Fix for bug #3692 (QGIS segfaults after removing table join)

Modified: trunk/qgis/src/core/qgsvectorlayerjoinbuffer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayerjoinbuffer.cpp	2011-04-14 11:42:15 UTC (rev 15699)
+++ trunk/qgis/src/core/qgsvectorlayerjoinbuffer.cpp	2011-04-14 19:09:27 UTC (rev 15700)
@@ -47,7 +47,12 @@
     if ( mVectorJoins.at( i ).joinLayerId == joinLayerId )
     {
       mVectorJoins.removeAt( i );
-      return;
+      //remove corresponding fetch join info
+      QgsVectorLayer* joinLayer = dynamic_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( joinLayerId ) );
+      if ( joinLayer )
+      {
+        mFetchJoinInfos.remove( joinLayer );
+      }
     }
   }
 }