[Slim-Checkins] r10457 - in /trunk/server: Changelog7.html Slim/Display/Lib/Fonts.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Mon Oct 23 13:36:52 2006
New Revision: 10457

URL: http://svn.slimdevices.com?rev=10457&view=rev
Log:
Bug: 4409
Description: change regexp so fonts are found correctly on windows

Modified:
    trunk/server/Changelog7.html
    trunk/server/Slim/Display/Lib/Fonts.pm

Modified: trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/trunk/server/Changelog7.html?rev=10457&r1=10456&r2=10457&view=diff
==============================================================================
--- trunk/server/Changelog7.html (original)
+++ trunk/server/Changelog7.html Mon Oct 23 13:36:52 2006
@@ -71,6 +71,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4259">#4259</a> - Fishbone never refreshes playlist</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4293">#4293</a> - Move to using Log::Log4perl to replace --d_* debugging.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4338">#4338</a> - MusicMagic => MusicIP</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4409">#4409</a> - All fonts lost</li>
 	<ul>
 		<li></li>
 

Modified: trunk/server/Slim/Display/Lib/Fonts.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Lib/Fonts.pm?rev=10457&r1=10456&r2=10457&view=diff
==============================================================================
--- trunk/server/Slim/Display/Lib/Fonts.pm (original)
+++ trunk/server/Slim/Display/Lib/Fonts.pm Mon Oct 23 13:36:52 2006
@@ -447,7 +447,7 @@
 
 			my $file = $fileObj->stringify;
 
-			if ($file =~ /\/(.+?)\.font\.bmp$/) {
+			if ($file =~ /[\/\\](.+?)\.font\.bmp$/) {
 
 				$fonts{basename($1)} = $file;