[Slim-Checkins] r8987 - in /trunk/server/Slim/Buttons: Common.pm Volume.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Aug 16 11:29:42 2006
New Revision: 8987

URL: http://svn.slimdevices.com?rev=8987&view=rev
Log:
Bug: N/A
Description: Avoid volume mode scrolling screen2

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

Modified: trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Common.pm?rev=8987&r1=8986&r2=8987&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Common.pm (original)
+++ trunk/server/Slim/Buttons/Common.pm Wed Aug 16 11:29:42 2006
@@ -1219,6 +1219,8 @@
 
 	$::d_ui && msg("pushing button mode: $setmode\n");
 
+	my $oldscreen2 = $client->modeVariable('screen2');
+
 	my $oldmode = mode($client);
 
 	if ($oldmode) {
@@ -1262,12 +1264,14 @@
 	if ($client->display->hasScreen2) {
 		my $screen2 = $client->param('screen2');
 
+		if ($client->display->showExtendedText() && !$screen2) {
+			$screen2 = 'periodic';
+		} elsif ($screen2 eq 'inherit') {
+			$screen2 = $oldscreen2;
+		}
+
 		# set mode variable screen2 so we can modify it later
-		if ($client->display->showExtendedText() && !$screen2) {
-			$client->modeVariable('screen2', 'periodic');
-		} else {
-			$client->modeVariable('screen2', $screen2);
-		}			
+		$client->modeVariable('screen2', $screen2);
 	}
 
 	# some modes require periodic updates

Modified: trunk/server/Slim/Buttons/Volume.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Volume.pm?rev=8987&r1=8986&r2=8987&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Volume.pm (original)
+++ trunk/server/Slim/Buttons/Volume.pm Wed Aug 16 11:29:42 2006
@@ -35,6 +35,7 @@
 			'subcommand' => 'volume',
 			'initialValue' => sub { return $_[0]->volume() },
 			'callback' => \&volumeExitHandler,
+			'screen2' => 'inherit',
 		};
 }
 
@@ -82,6 +83,8 @@
 		return;
 	}
 
+	$client->param('screen2', 'inherit');
+
 	Slim::Buttons::Common::pushMode($client,'INPUT.Bar',$params);
 	
 	_volumeIdleChecker($client);