[Slim-Checkins] r9025 - /trunk/server/Slim/Buttons/Common.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Thu Aug 17 15:32:10 2006
New Revision: 9025

URL: http://svn.slimdevices.com?rev=9025&view=rev
Log:
Bug: N/A
Description: silence undef warnings

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

Modified: trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Common.pm?rev=9025&r1=9024&r2=9025&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Common.pm (original)
+++ trunk/server/Slim/Buttons/Common.pm Thu Aug 17 15:32:10 2006
@@ -1268,7 +1268,7 @@
 
 		if ($client->display->showExtendedText() && !$screen2) {
 			$screen2 = 'periodic';
-		} elsif ($screen2 eq 'inherit') {
+		} elsif ($screen2 && $screen2 eq 'inherit') {
 			$screen2 = $oldscreen2;
 		}
 
@@ -1320,11 +1320,13 @@
 
 		my $suppressScreen2Update = shift;
 
+		my $screen2 = $client->modeVariable('screen2');
+
 		if ($client->display->showExtendedText()) {
 
-			$client->modeVariable('screen2', 'periodic') unless ($client->modeVariable('screen2'));
-
-		} elsif ($client->modeVariable('screen2') eq 'periodic') {
+			$client->modeVariable('screen2', 'periodic') unless $screen2;
+
+		} elsif ($screen2 && $screen2 eq 'periodic') {
 
 			$client->modeVariable('screen2', undef);
 		}