[Slim-Checkins] r10202 - in /branches/6.5/server: Changelog6.html Slim/Web/Setup.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Wed Oct  4 18:30:41 2006
New Revision: 10202

URL: http://svn.slimdevices.com?rev=10202&view=rev
Log:
Bug: 4207
Description: merge -r10200:10201 from trunk


Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Web/Setup.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10202&r1=10201&r2=10202&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Oct  4 18:30:41 2006
@@ -48,10 +48,11 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4192">#4192</a> - IE doesn't refresh status</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4201">#4201</a> - Deselecting all genres in Random Mix creates invalid SQL query, stops SS</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4205">#4205</a> - sleep function with SlimServer 6.5.0 in Fishbone skin, songs longer than 90 minutes</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4207">#4207</a> - Less than 2 title formats in server settings breaks player title format strings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4208">#4208</a> - Screen 2 of Now Playing is not updated immediately when track is changed by fwd/rev etc</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4213">#4213</a> - Slimserver can crash due to display being deleted from client object at forget time</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4221">#4221</a> - 6.5 crashes on artist breadcrumb</li>
- 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4228">#4228</a> - Fishbone skin status doesn't update from an empty playlist</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4228">#4228</a> - Fishbone skin status doesn't update from an empty playlist</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4237">#4237</a> - in Help > Internet Radio there is a dead link to Settings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4242">#4242</a> - changing the name of a player while it's playing audio causes a skip</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4245">#4245</a> - Pressing PLAY on top level browse pushes right</li>

Modified: branches/6.5/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Web/Setup.pm?rev=10202&r1=10201&r2=10202&view=diff
==============================================================================
--- branches/6.5/server/Slim/Web/Setup.pm (original)
+++ branches/6.5/server/Slim/Web/Setup.pm Wed Oct  4 18:30:41 2006
@@ -2585,11 +2585,6 @@
 	my $pref = shift;
 	my %prefsHash;
 	
-	# hack around a race condition at startup
-	if (!Slim::Utils::Prefs::getArrayMax($pref)) {
-		return;
-	};
-	
 	$prefsHash{'-1'} = ' '; #used to delete a title format from the list
 	my $i = 0;
 	foreach my $item (Slim::Utils::Prefs::getArray($pref)) {