From kde-commits  Sat Jan 10 02:36:25 2009
From: "Seb Ruiz" <ruiz () kde ! org>
Date: Sat, 10 Jan 2009 02:36:25 +0000
To: kde-commits
Subject: Re: extragear/multimedia/amarok/src/scriptengine
Message-Id: <60ebdd0b0901091836k6aa4ce9fx5280b8e729351f56 () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123155503412146

2009/1/10 Seb Ruiz <ruiz@kde.org>:
> SVN commit 908646 by seb:
>
> Merge branch 'token'

you stupid git.

>
>  M  +2 -2      MetaTypeExporter.cpp
>
>
> --- trunk/extragear/multimedia/amarok/src/scriptengine/MetaTypeExporter.cpp #908645:908646
> @@ -177,7 +177,7 @@
>  MetaTrackPrototype::imageUrl() const
>  {
>     GET_TRACK
> -    return track ? track->album()->imageLocation().prettyUrl() : QString();
> +    return ( track && track->album() ) ? track->album()->imageLocation().prettyUrl() : QString();
>  }
>
>  bool
> @@ -289,7 +289,7 @@
>  MetaTrackPrototype::setImageUrl(const QString& imageUrl )
>  {
>     GET_TRACK
> -    if ( track ) track->album()->setImage(QImage(imageUrl));
> +    if ( track && track->album() ) track->album()->setImage( QImage(imageUrl) );
>  }
>
>  #undef GET_TRACK
>



-- 
Seb Ruiz

http://www.sebruiz.net/
http://amarok.kde.org/