[Slim-Checkins] r9650 - in /branches/6.5/server: Changelog6.html Slim/Display/Graphics.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Sep 12 13:31:13 2006
New Revision: 9650

URL: http://svn.slimdevices.com?rev=9650&view=rev
Log:
Bug: 4094
Description: merge -r 9648:9649 from trunk

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Display/Graphics.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9650&r1=9649&r2=9650&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Tue Sep 12 13:31:13 2006
@@ -607,6 +607,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4064">#4064</a> - Broken ogg file causes playlist to get one behind</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4070">#4070</a> - File cache world writable</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4078">#4078</a> - Random mix does not always work with sync</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4094">#4094</a> - Display 'bits' go blank briefly when screen text begins to scroll after a push</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4096">#4096</a> - DBD::mysql::st execute failed: Unknown column 'me.name'</li>
 	</ul>
 </ul>

Modified: branches/6.5/server/Slim/Display/Graphics.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Display/Graphics.pm?rev=9650&r1=9649&r2=9650&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/Graphics.pm (original)
+++ branches/6.5/server/Slim/Display/Graphics.pm Tue Sep 12 13:31:13 2006
@@ -98,6 +98,7 @@
 		#  line            - array of cached lines
 		#  overlay         - array of cached overlays
 		#  center          - array of cached centers
+		#  bits            - bitmap for screen (if included in last render) else undef
 		#  linebits        - array of bitmaps for cached lines
 		#  overlaybits     - array of bitmaps for cached overlays
 		#  centerbits      - array of bitmaps for cached centers
@@ -414,9 +415,12 @@
 		}
 
 		# Bitmaps
-		if (defined($screen->{bits}) && length($screen->{bits})) { 
+		if (defined($screen->{bits}) && length($screen->{bits})) {
 			$bits |= substr($screen->{bits}, 0, $screensize);
+			$sc->{bits} = $screen->{bits} unless $rerender;
 			$sc->{changed} = 1;
+		} else {
+			$sc->{bits} = undef;
 		}
 
 		$sc->{bitsref} = \$bits;