Index: Slim/Music/Info.pm =================================================================== RCS file: /home/cvs/cvsroot/slim/server/Slim/Music/Info.pm,v retrieving revision 1.154 diff -u -p -B -r1.154 Info.pm --- Slim/Music/Info.pm 21 Oct 2004 01:18:54 -0000 1.154 +++ Slim/Music/Info.pm 24 Nov 2004 06:41:31 -0000 @@ -2039,6 +2041,7 @@ sub isFragment { sub readTags { my $file = shift; + my $cacheEntry = shift; my ($track, $song, $artistName,$albumName); my $filepath; my $type; @@ -2080,7 +2082,8 @@ sub readTags { $tempCacheEntry = &{$tagFunctions{$type}}($filepath, $anchor); } $::d_info && !defined($tempCacheEntry) && Slim::Utils::Misc::msg("Info: no tags found for $filepath\n"); - + @{$tempCacheEntry}{keys %{$cacheEntry}} = values %{$cacheEntry} if defined $cacheEntry; + if (defined($tempCacheEntry->{'TRACKNUM'})) { $tempCacheEntry->{'TRACKNUM'} = cleanTrackNumber($tempCacheEntry->{'TRACKNUM'}); } Index: Slim/Formats/Parse.pm =================================================================== RCS file: /home/cvs/cvsroot/slim/server/Slim/Formats/Parse.pm,v retrieving revision 1.23 diff -u -p -B -r1.23 Parse.pm --- Slim/Formats/Parse.pm 15 Oct 2004 23:48:24 -0000 1.23 +++ Slim/Formats/Parse.pm 24 Nov 2004 06:41:31 -0000 @@ -297,11 +297,7 @@ sub parseCUE { $::d_parse && Slim::Utils::Misc::msg(" album: " . $cacheEntry->{'ALBUM'} . "\n"); } - Slim::Music::Info::readTags($url); - Slim::Music::Info::updateCacheEntry($url, $cacheEntry); - $cacheEntry = Slim::Music::Info::cacheEntry($url); #grab the merged info - Slim::Music::Info::updateGenreCache($url, $cacheEntry); - + Slim::Music::Info::readTags($url,$cacheEntry); } $::d_parse && Slim::Utils::Misc::msg(" returning: " . scalar(@items) . " items\n");