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

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Sep 24 10:23:18 2006
New Revision: 10019

URL: http://svn.slimdevices.com?rev=10019&view=rev
Log:
Bug: 4213
Description: merge  -r 10017:10018 from trunk

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

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10019&r1=10018&r2=10019&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sun Sep 24 10:23:18 2006
@@ -15,6 +15,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4190">#4190</a> - xmlbrower transition problem</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4191">#4191</a> - Live365 Search has missing strings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4192">#4192</a> - IE doesn't refresh status</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4213">#4213</a> - Slimserver can crash due to display being deleted from client object at forget time</li>
 	<ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Display/Display.pm?rev=10019&r1=10018&r2=10019&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/Display.pm (original)
+++ branches/6.5/server/Slim/Display/Display.pm Sun Sep 24 10:23:18 2006
@@ -711,7 +711,6 @@
 sub forgetDisplay {
 	my $display = shift;
 	Slim::Utils::Timers::forgetTimer($display);
-	$display->client->display(undef);
 }
 
 our $failsafeLanguage     = Slim::Utils::Strings::failsafeLanguage();