[Slim-Checkins] r33663 - /7.7/trunk/server/Slim/Utils/PluginManager.pm

Author: mherger
Date: Sun Nov  6 22:39:23 2011
New Revision: 33663

URL: http://svn.slimdevices.com/slim?rev=33663&view=rev
Log:
Fixed Bug: 17647
Description: re-enable disabled plugin if it's enforced

Modified:
    7.7/trunk/server/Slim/Utils/PluginManager.pm

Modified: 7.7/trunk/server/Slim/Utils/PluginManager.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Utils/PluginManager.pm?rev=33663&r1=33662&r2=33663&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Utils/PluginManager.pm (original)
+++ 7.7/trunk/server/Slim/Utils/PluginManager.pm Sun Nov  6 22:39:23 2011
@@ -219,8 +219,15 @@
 		}
 
 		if (defined $state && $state eq 'disabled') {
-			$log->warn("Skipping plugin: $name - disabled");
-			next;
+			# bug 17647 - we must re-enable an enforced plugin if it has been disabled
+			if ( $plugins->{$name}->{'enforce'} ) {
+				$log->warn("Re-enabling plugin as it is enforced: $name");
+				$state = $class->_needsEnable($name);
+			}
+			else {
+				$log->warn("Skipping plugin: $name - disabled");
+				next;
+			}
 		}
 
 		# Skip plugins that can't be loaded.