[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: extragear/multimedia/amarok/src/scriptengine
From: "Seb Ruiz" <ruiz () kde ! org>
Date: 2009-01-10 2:36:25
Message-ID: 60ebdd0b0901091836k6aa4ce9fx5280b8e729351f56 () mail ! gmail ! com
[Download RAW message or body]
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/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic