Index: Plugins/iTunes.pm =================================================================== --- Plugins/iTunes.pm (revision 3290) +++ Plugins/iTunes.pm (working copy) @@ -168,7 +168,8 @@ sub initPlugin { return 1 if $initialized; - addGroups(); + Slim::Web::Setup::addChildren('server','itunes',3); + Slim::Web::Setup::addCategory('itunes',&setupCategory); return unless canUseiTunesLibrary(); @@ -192,6 +193,9 @@ Slim::Music::Import::useImporter('ITUNES', Slim::Utils::Prefs::get('itunes')); Slim::Player::Source::registerProtocolHandler("itunesplaylist", "0"); + my ($groupRef,$prefRef) = setupUse(); + Slim::Web::Setup::addGroup('server','itunes',$groupRef,3,$prefRef); + $initialized = 1; # Pass checker a value, to let it know that we're just seeing if we're @@ -229,7 +233,7 @@ $initialized = 0; # delGroups, categories and prefs - #Slim::Web::Setup::delCategory('itunes'); + Slim::Web::Setup::delCategory('itunes'); Slim::Web::Setup::delGroup('server','itunes',1); # set importer to not use @@ -237,15 +241,6 @@ Slim::Music::Import::useImporter('ITUNES',0); } -sub addGroups { - Slim::Web::Setup::addChildren('server','itunes',3); - Slim::Web::Setup::addCategory('itunes',&setupCategory); - - my ($groupRef,$prefRef) = setupUse(); - - Slim::Web::Setup::addGroup('server','itunes',$groupRef,3,$prefRef); -} - sub findLibraryFromPlist { my $path = undef; my $base = shift @_;