--- Scan.pm.old	2004-09-23 12:48:28.000000000 -0700
+++ Scan.pm	2004-09-23 12:48:14.000000000 -0700
@@ -197,6 +197,12 @@ sub addToList_run {
 			}
 			my $itemsToAddref = $curdirState->itemsToAdd;
 			@$itemsToAddref=();
+			my $curdir = Slim::Utils::Prefs::get('audiodir');
+			if ($curdirState->path =~ /^\Q$curdir\E(.*)/i) {
+				&addToList_done($listref);
+				$::d_scan && msg($curdirState->path." might be circular link, skipping\n");
+				return 0;
+			}
 			$::d_scan && msg("Descending into ".$curdirState->path.", contains ".$curdirState->numcontents." items\n");
 			return 1;
 		} else {