[Slim-Checkins] r33903 - in /7.8/trunk/server: Changelog7.html Slim/Formats/Playlists/M3U.pm

Author: mherger
Date: Sun Mar 25 21:22:45 2012
New Revision: 33903

URL: http://svn.slimdevices.com/slim?rev=33903&view=rev
Log:
Fixed Bug: 17933
Description: fix variable initialization

Modified:
    7.8/trunk/server/Changelog7.html
    7.8/trunk/server/Slim/Formats/Playlists/M3U.pm

Modified: 7.8/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.8/trunk/server/Changelog7.html?rev=33903&r1=33902&r2=33903&view=diff
==============================================================================
--- 7.8/trunk/server/Changelog7.html (original)
+++ 7.8/trunk/server/Changelog7.html Sun Mar 25 21:22:45 2012
@@ -10,6 +10,7 @@
 	<ul>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=8180">#8180</a> - Squeezecenter prevents user logout after restart </li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17729">#17729</a> - On Linux SBS 7.4.1 and above: service cannot be stopped or restarted after an 'internal' restart</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17933">#17933</a> - Failure to parse m3u playlists with relative paths</li>
 	</ul>
 	<br />
 </ul>

Modified: 7.8/trunk/server/Slim/Formats/Playlists/M3U.pm
URL: http://svn.slimdevices.com/slim/7.8/trunk/server/Slim/Formats/Playlists/M3U.pm?rev=33903&r1=33902&r2=33903&view=diff
==============================================================================
--- 7.8/trunk/server/Slim/Formats/Playlists/M3U.pm (original)
+++ 7.8/trunk/server/Slim/Formats/Playlists/M3U.pm Sun Mar 25 21:22:45 2012
@@ -28,7 +28,6 @@
 	my ($class, $file, $baseDir, $url) = @_;
 
 	my @items  = ();
-	my ($secs, $artist, $album, $title, $trackurl);
 	my $foundBOM = 0;
 	my $fh;
 	my $mediadirs;
@@ -52,6 +51,8 @@
 	main::INFOLOG && $log->info("Parsing M3U: $url");
 
 	while (my $entry = <$fh>) {
+	
+		my ($secs, $artist, $album, $title, $trackurl);
 
 		chomp($entry);
 
@@ -146,9 +147,6 @@
 				'ARTIST' => $artist,
 				'SECS'   => ( defined $secs && $secs > 0 ) ? $secs : undef,
 			} );
-
-			# reset the title
-			($secs, $artist, $album, $title, $trackurl) = ();
 		}
 		else {
 			# Check if the playlist entry is relative to audiodir