[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/scriptengine
From:       Seb Ruiz <ruiz () kde ! org>
Date:       2009-01-10 2:33:03
Message-ID: 1231554783.322652.19535.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 908646 by seb:

Merge branch 'token'

 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
[prev in list] [next in list] [prev in thread] [next in thread]