Skip to content
Permalink
Browse files

avoid warning messages on composer arrows without markers

  • Loading branch information
jef-n committed Mar 27, 2014
1 parent b4b0155 commit a838700801c6c847ef570eb5078ac0b6b0d6e394
Showing with 4 additions and 4 deletions.
  1. +4 −4 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;

0 comments on commit a838700

Please sign in to comment.
You can’t perform that action at this time.