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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/scriptengine
From:       Dan Meltzer <parallelgrapefruit () gmail ! com>
Date:       2009-02-01 6:00:20
Message-ID: 1233468020.243163.18062.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 919484 by dmeltzer:

Fix a whole bunch of possible crashes

 M  +5 -5      MetaTypeExporter.cpp  


--- trunk/extragear/multimedia/amarok/src/scriptengine/MetaTypeExporter.cpp #919483:919484
@@ -121,35 +121,35 @@
 MetaTrackPrototype::album() const
 {
     GET_TRACK
-    return track ? track->album()->prettyName() : QString();
+    return ( track && track->album() ) ? track->album()->prettyName() : QString();
 }
 
 QString
 MetaTrackPrototype::artist() const
 {
     GET_TRACK
-    return track ? track->artist()->prettyName() : QString();
+    return ( track && track->artist() ) ? track->artist()->prettyName() : QString();
 }
 
 QString
 MetaTrackPrototype::composer() const
 {
     GET_TRACK
-    return track ? track->composer()->prettyName() : QString();
+    return ( track && track->composer() ) ? track->composer()->prettyName() : QString();
 }
 
 QString
 MetaTrackPrototype::genre() const
 {
     GET_TRACK
-    return track ? track->genre()->prettyName() : QString();
+    return ( track && track->genre() ) ? track->genre()->prettyName() : QString();
 }
 
 QString
 MetaTrackPrototype::year() const
 {
     GET_TRACK
-    return track ? track->year()->prettyName() : QString();
+    return ( track && track->year() ) ? track->year()->prettyName() : QString();
 }
 
 QString
[prev in list] [next in list] [prev in thread] [next in thread]