[QGIS Commit] r12389 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-12-09 14:58:22 -0500 (Wed, 09 Dec 2009)
New Revision: 12389

Modified:
   trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp
Log:
Workaround to make bug #2209 less likely

Modified: trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp	2009-12-09 19:26:41 UTC (rev 12388)
+++ trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp	2009-12-09 19:58:22 UTC (rev 12389)
@@ -462,6 +462,13 @@
 
 bool QgsComposerPictureWidget::testSvgFile( const QString& filename ) const
 {
+  //QSvgRenderer crashes with some (non-svg) xml documents.
+  //So at least we try to sort out the ones with different suffixes
+  if(!filename.endsWith(".svg"))
+  {
+    return false;
+  }
+
   QSvgRenderer svgRenderer( filename );
   if ( svgRenderer.isValid() )
   {