Workaround to make bug #2209 less likely

mhugent · mhugent · commit e9883744fca5 · 2009-12-09T19:58:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12389 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposerpicturewidget.cpp b/src/app/composer/qgscomposerpicturewidget.cpp
@@ -462,6 +462,13 @@ void QgsComposerPictureWidget::addStandardDirectoriesToPreview()
 
 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() )
   {

Original file line number	Diff line number	Diff line change
`@@ -462,6 +462,13 @@ void QgsComposerPictureWidget::addStandardDirectoriesToPreview()`
`462`	`462`
`463`	`463`	`bool QgsComposerPictureWidget::testSvgFile( const QString& filename ) const`
`464`	`464`	`{`
	`465`	`+ //QSvgRenderer crashes with some (non-svg) xml documents.`
	`466`	`+ //So at least we try to sort out the ones with different suffixes`
	`467`	`+ if(!filename.endsWith(".svg"))`
	`468`	`+ {`
	`469`	`+ return false;`
	`470`	`+ }`
	`471`	`+`
`465`	`472`	`QSvgRenderer svgRenderer( filename );`
`466`	`473`	`if ( svgRenderer.isValid() )`
`467`	`474`	`{`