--- /somewhere/SlimServer_v6.5.0/Slim/Formats/Playlists/CUE.pm.old	2006-09-24 16:50:32.000000000 +0200
+++ /somewhere/SlimServer_v6.5.0/Slim/Formats/Playlists/CUE.pm	2006-09-24 18:49:53.000000000 +0200
@@ -90,6 +90,12 @@
 		} elsif ($line =~ /^\s*TRACK\s+(\d+)\s+AUDIO/i) {
 
 			$currtrack = int($1);
+			if (defined $filename) {
+				# Each track in a cue sheet can have a different
+				# filename. See Bug 2126 &
+				# http://www.hydrogenaudio.org/forums/index.php?act=ST&f=20&t=4586
+				$tracks->{$currtrack}->{'FILENAME'} = $filename;
+			}
 
 		} elsif (defined $currtrack and $line =~ /^\s*PERFORMER\s+\"(.*)\"/i) {
 
@@ -121,11 +127,6 @@
 
 			$tracks->{$currtrack}->{'END'} = ($1 * 60) + $2 + ($3 / 75);			
 
-		} elsif (defined $currtrack and defined $filename) {
-			# Each track in a cue sheet can have a different
-			# filename. See Bug 2126 &
-			# http://www.hydrogenaudio.org/forums/index.php?act=ST&f=20&t=4586
-			$tracks->{$currtrack}->{'FILENAME'} = $filename;
 		}
 	}