Index: D:/workspace/7.2/server/Slim/Utils/Scanner.pm
===================================================================
--- D:/workspace/7.2/server/Slim/Utils/Scanner.pm	(revision 22835)
+++ D:/workspace/7.2/server/Slim/Utils/Scanner.pm	(working copy)
@@ -152,10 +152,12 @@
 			$url  = Slim::Utils::Misc::fileURLFromWinShortcut($url) || next;
 			$file = Slim::Utils::Misc::pathFromFileURL($url);
 
+			my $audiodir = preferences('server')->get('audiodir');
+
 			# Bug: 2485:
 			# Use Path::Class to determine if the file points to a
 			# directory above us - if so, that's a loop and we need to break it.
-			if (dir($file)->subsumes($topDir) || dir($file)->subsumes(preferences('server')->get('audiodir'))) {
+			if ( dir($file)->subsumes($topDir) || ($audiodir && dir($file)->subsumes($audiodir)) ) {
 
 				logWarning("Found an infinite loop! Breaking out: $file -> $topDir");
 				next;