[Slim-Checkins] r8935 - /trunk/server/Slim/Buttons/Volume.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Fri Aug 11 14:06:15 2006
New Revision: 8935

URL: http://svn.slimdevices.com?rev=8935&view=rev
Log:
Bug: N/A
Desciption: ensure we don't pop the mode stack completely - must kill
timer on mode exit

Modified:
    trunk/server/Slim/Buttons/Volume.pm

Modified: trunk/server/Slim/Buttons/Volume.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Volume.pm?rev=8935&r1=8934&r2=8935&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Volume.pm (original)
+++ trunk/server/Slim/Buttons/Volume.pm Fri Aug 11 14:06:15 2006
@@ -46,8 +46,9 @@
 sub volumeExitHandler {
 	my ($client,$exittype) = @_;
 	if ($exittype) { $exittype = uc($exittype); }
-	
+
 	if (!$exittype || $exittype eq 'LEFT') {
+		Slim::Utils::Timers::killTimers($client, \&_volumeIdleChecker);
 		Slim::Buttons::Common::popModeRight($client);
 	} elsif ($exittype eq 'RIGHT') {
 			$client->bumpRight();
@@ -74,8 +75,9 @@
 sub setMode {
 	my $client = shift;
 	my $method = shift;
-	
+
 	if ($method eq 'pop') {
+		Slim::Utils::Timers::killTimers($client, \&_volumeIdleChecker);
 		Slim::Buttons::Common::popMode($client);
 		return;
 	}
@@ -98,4 +100,4 @@
 
 
 
-1;
+1;