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

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Oct  8 12:28:33 2006
New Revision: 10266

URL: http://svn.slimdevices.com?rev=10266&view=rev
Log:
Bug: 4325
Description: merge -r 10264:10265 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=10266&r1=10265&r2=10266&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sun Oct  8 12:28:33 2006
@@ -74,7 +74,8 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4303">#4303</a> - Second WMA stream in playlist not used</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4304">#4304</a> - select a music source menu only lets you see the first 3 options</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4305">#4305</a> - information left on right display after pressing/holding left arrow</li>
-		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4309">#4317</a> - Random mix loads to wrong player after player change</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4317">#4317</a> - Random mix loads to wrong player after player change</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4325">#4325</a> - Overlay does not correctly encode non latin characters</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=10266&r1=10265&r2=10266&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/Graphics.pm (original)
+++ branches/6.5/server/Slim/Display/Graphics.pm Sun Oct  8 12:28:33 2006
@@ -283,7 +283,9 @@
 				if (defined($screen->{overlay}[$l]) && 
 					(!defined($sc->{overlay}[$l]) || ($screen->{overlay}[$l] ne $sc->{overlay}[$l]))) {
 					$sc->{overlay}[$l] = $screen->{overlay}[$l];
-					$sc->{overlaybits}[$l] = Slim::Display::Lib::Fonts::string($sfonts->{overlay}[$l]||$dfonts->{overlay}[$l], "\x00" . $screen->{overlay}[$l]);
+					my $overlay;
+					{ no bytes; $overlay = "\x00" . $sc->{overlay}[$l]; }
+					$sc->{overlaybits}[$l] = Slim::Display::Lib::Fonts::string($sfonts->{overlay}[$l]||$dfonts->{overlay}[$l], $overlay);
 					if (length($sc->{overlaybits}[$l]) > $screensize ) {
 						$sc->{overlaybits}[$l] = substr($sc->{overlaybits}[$l], 0, $screensize);
 					}