[Slim-Checkins] r10262 - /branches/6.5/server/Slim/Buttons/Volume.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Oct  8 11:40:39 2006
New Revision: 10262

URL: http://svn.slimdevices.com?rev=10262&view=rev
Log:
Bug: 2314
Description: merge -r 10260:10261 from trunk

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

Modified: branches/6.5/server/Slim/Buttons/Volume.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Volume.pm?rev=10262&r1=10261&r2=10262&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Volume.pm (original)
+++ branches/6.5/server/Slim/Buttons/Volume.pm Sun Oct  8 11:40:39 2006
@@ -73,8 +73,8 @@
 		'onChange'     => \&Slim::Buttons::Settings::executeCommand,
 		'command'      => 'mixer',
 		'subcommand'   => 'volume',
-		'initialValue' => sub { return $_[0]->volume },
-		'valueRef'     => $client->volume,
+		'initialValue' => sub { return $_[0]->prefGet('volume') },
+		'valueRef'     => $client->prefGet('volume'),
 		'callback'     => \&volumeExitHandler,
 		'increment'    => 1,
 		'lines'        => $client->customVolumeLines(),