[Slim-Checkins] r10013 - in /trunk/server/Slim: Networking/Slimproto.pm bootstrap.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Sep 24 06:27:48 2006
New Revision: 10013

URL: http://svn.slimdevices.com?rev=10013&view=rev
Log:
Bug: N/A
Description: bring back warnings when failing to load display class

Modified:
    trunk/server/Slim/Networking/Slimproto.pm
    trunk/server/Slim/bootstrap.pm

Modified: trunk/server/Slim/Networking/Slimproto.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Networking/Slimproto.pm?rev=10013&r1=10012&r2=10013&view=diff
==============================================================================
--- trunk/server/Slim/Networking/Slimproto.pm (original)
+++ trunk/server/Slim/Networking/Slimproto.pm Sun Sep 24 06:27:48 2006
@@ -814,12 +814,6 @@
 
 		Slim::bootstrap::tryModuleLoad($display_class);
 
-		if ($@) {
-			errorMsg("Couldn't load module: $display_class: [$@] - THIS IS FATAL\n");
-			bt();
-			$@ = '';
-		}
-
 		$client->display( $display_class->new($client) );
 	}
 
@@ -835,12 +829,6 @@
 		);
 
 		Slim::bootstrap::tryModuleLoad($display_class);
-
-		if ($@) {
-			errorMsg("Couldn't load module: $display_class: [$@] - THIS IS FATAL\n");
-			bt();
-			$@ = '';
-		}
 
 		$client->display( $display_class->new($client) );
 

Modified: trunk/server/Slim/bootstrap.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/bootstrap.pm?rev=10013&r1=10012&r2=10013&view=diff
==============================================================================
--- trunk/server/Slim/bootstrap.pm (original)
+++ trunk/server/Slim/bootstrap.pm Sun Sep 24 06:27:48 2006
@@ -250,7 +250,7 @@
 
 		if ($@) {
 
-			if ($d_startup || ($::d_plugins && $module =~ /^Plugins::/)) {
+			if ($d_startup || $module =~ /^Slim::Display::/ || ($::d_plugins && $module =~ /^Plugins::/)) {
 
 				warn "Module [$module] failed to load: [$@]\n";
 			}