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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/collection/sqlcollection
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2008-09-08 7:43:03
Message-ID: 1220859783.523340.19517.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 858469 by markey:

Fix crash while scanning collection.

Hydrogen: can you please review my fix and your code logic? The fix isn't really \
proper, it's just a stop-gap.

BUG: 170662
CCMAIL: parallelgrapefruit@gmail.com


 M  +2 -2      SqlMeta.cpp  


--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/SqlMeta.cpp \
#858468:858469 @@ -1163,7 +1163,7 @@
 bool
 SqlAlbum::hasAlbumArtist() const
 {
-    return m_artistId != 0;
+    return albumArtist();
 }
 
 Meta::ArtistPtr
@@ -1174,7 +1174,7 @@
         QString query = QString( "SELECT artists.name FROM artists WHERE artists.id \
= %1;" ).arg( m_artistId );  QStringList result = m_collection->query( query );
         if( result.isEmpty() )
-            return Meta::ArtistPtr();
+            return Meta::ArtistPtr(); //FIXME BORKED LOGIC: can return 0, although \
m_artistId != 0  const_cast<SqlAlbum*>( this )->m_artist =
             m_collection->registry()->getArtist( result.first(), m_artistId );
     }


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