avoid warning messages on composer arrows without markers

qgis · Mar 27, 2014 · a838700 · a838700
1 parent b4b0155
commit a838700
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp
@@ -169,14 +169,14 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
   QSvgRenderer r;
   if ( type == StartMarker )
   {
-    if ( !r.load( mStartMarkerFile ) )
+    if ( mStartMarkerFile.isEmpty() || !r.load( mStartMarkerFile ) )
     {
       return;
     }
   }
   else //end marker
   {
-    if ( !r.load( mEndMarkerFile ) )
+    if ( mEndMarkerFile.isEmpty() || !r.load( mEndMarkerFile ) )
     {
       return;
     }
@@ -215,7 +215,7 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
 void QgsComposerArrow::setStartMarker( const QString& svgPath )
 {
   QSvgRenderer r;
-  if ( !r.load( svgPath ) )
+  if ( svgPath.isEmpty() || !r.load( svgPath ) )
   {
     return;
     // mStartArrowHeadHeight = 0;
@@ -231,7 +231,7 @@ void QgsComposerArrow::setStartMarker( const QString& svgPath )
 void QgsComposerArrow::setEndMarker( const QString& svgPath )
 {
   QSvgRenderer r;
-  if ( !r.load( svgPath ) )
+  if ( svgPath.isEmpty() || !r.load( svgPath ) )
   {
     return;
     // mStopArrowHeadHeight = 0;