i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if disk has compilation artist

Browse Source 
... before looking for track specific artist information. Fixes #9813

Signed-off-by: John Scipione <[email protected]>
This commit is contained in:
John Scipione
2013-06-12 19:02:00 -04:00
parent 1f0b41ba7f
commit 7a66a8375d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/cddb_daemon/cddb_server.cpp
+5 -2
View File
@@ -257,11 +257,14 @@ CDDBServer::Read(QueryResponseData* diskData, ReadResponseData* readResponse)
trackData->trackNumber = track; trackData->trackNumber = track;
int32 pos = line.FindFirst(" / " ); int32 pos = line.FindFirst(" / " );
if (pos != B_ERROR) { if (pos != B_ERROR && diskData->artist.ICompare("Various") == 0) {
// We have track specific artist information. // Disk is set to have a compilation artist and
// we have track specific artist information.
BString artist; BString artist;
line.MoveInto(artist, 0, pos); line.MoveInto(artist, 0, pos);
// Move artist information from line to artist.
line.Remove(0, 3); line.Remove(0, 3);
// Remove " / " from line.
trackData->artist = artist; trackData->artist = artist;
} else { } else {
trackData->artist = diskData->artist; trackData->artist = diskData->artist;