[Slim-Checkins] r10040 - /branches/6.5/server/Slim/Buttons/Common.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Mon Sep 25 19:43:18 2006
New Revision: 10040

URL: http://svn.slimdevices.com?rev=10040&view=rev
Log:
Bug 4205
Description: sort sleep options, as moving to the next option requires a larger time option. This will move the 'end of song' option into chronological placement.  The added side effect is that as time to end of song shrinks, the next sleep option will then fit to the next highest time even if the remaining time has moved from longer than 15 mintues to less than 15 minutes, for example. 


Modified:
    branches/6.5/server/Slim/Buttons/Common.pm

Modified: branches/6.5/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Common.pm?rev=10040&r1=10039&r2=10040&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Common.pm (original)
+++ branches/6.5/server/Slim/Buttons/Common.pm Mon Sep 25 19:43:18 2006
@@ -874,7 +874,7 @@
 		}
 
 		# add the 'after this song' option only if there is a defined value.
-		my @sleepChoices = $remaining ? (0, $remaining, 15,30,45,60,90) : (0,15,30,45,60,90);
+		my @sleepChoices = $remaining ? sort(0, $remaining, 15,30,45,60,90) : (0,15,30,45,60,90);
 		my $i = 0;
 
 		# find the next value for the sleep timer