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

List:       kde-commits
Subject:    =?utf-8?q?=5Bamarok=5D_src/core-impl/collections/db/sql=3A_Set_A?=
From:       Sergey Ivanov <123kash () gmail ! com>
Date:       2011-05-10 16:42:40
Message-ID: 20110510164240.2A2AEA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 8940382bdc9b9a34cefb240fd2942223f81b6502 by Sergey Ivanov.
Committed on 10/05/2011 at 18:42.
Pushed by ivanov into branch 'master'.

Set AlbumArtist for destination track (if source has one) on Copy/Move to \
SqlCollection.

M  +12   -2    src/core-impl/collections/db/sql/SqlCollectionLocation.cpp     

http://commits.kde.org/amarok/8940382bdc9b9a34cefb240fd2942223f81b6502

diff --git a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp \
b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp index 993f4ce..fc4464d \
                100644
--- a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
@@ -268,8 +268,18 @@ SqlCollectionLocation::insert( const Meta::TrackPtr &track, \
const QString &url )  
     // Used to be updated after changes commit to prevent crash on NULL pointer \
access  // if metaTrack had no album.
-    if( track->album() && track->album()->hasImage() && \
                !metaTrack->album()->hasImage() )
-        metaTrack->album()->setImage( track->album()->image() );
+    if( track->album() && metaTrack->album() )
+    {
+        metaTrack->beginMetaDataUpdate();
+        
+        if( track->album()->hasAlbumArtist() && \
!metaTrack->album()->hasAlbumArtist() ) +            metaTrack->setAlbumArtist( \
track->album()->albumArtist()->name() ); +        
+        if( track->album()->hasImage() && !metaTrack->album()->hasImage() )
+            metaTrack->album()->setImage( track->album()->image() );
+        
+        metaTrack->endMetaDataUpdate();
+    }
 
     metaTrack->setWriteFile( true );
 


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