catch "feature exists" exception (to avoid crash) in case the provide…

…r goes crazy and returns duplicate feature IDs. git-svn-id: http://svn.osgeo.org/qgis/trunk@12207 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 20, 2009 · 79eaa5a · 79eaa5a
1 parent 04c2a50
commit 79eaa5a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/plugins/labeling/pallabeling.cpp b/src/plugins/labeling/pallabeling.cpp
@@ -216,6 +216,7 @@ void LayerSettings::calculateLabelSize( QString text, double& labelX, double& la
   labelY = fabs( ptSize.y() - ptZero.y() );
 }
 
+
 void LayerSettings::registerFeature( QgsFeature& f )
 {
   QString labelText = f.attributeMap()[fieldIndex].toString();
@@ -232,8 +233,16 @@ void LayerSettings::registerFeature( QgsFeature& f )
   geometries.append( lbl );
 
   // register feature to the layer
-  if ( !palLayer->registerFeature( lbl->strId(), lbl, labelX, labelY, labelText.toUtf8().constData() ) )
+  try
+  {
+    if ( !palLayer->registerFeature( lbl->strId(), lbl, labelX, labelY, labelText.toUtf8().constData() ) )
+      return;
+  }
+  catch ( std::exception* e )
+  {
+    std::cerr << "Ignoring feature " << f.id() << " due PAL exception: " << e->what() << std::endl;
     return;
+  }
 
   // TODO: only for placement which needs character info
   pal::Feature* feat = palLayer->getFeature( lbl->strId() );