diff --git a/scanner.c b/scanner.c
index b4e76f8..3114401 100644
--- a/scanner.c
+++ b/scanner.c
@@ -754,6 +754,10 @@ ScanDirectory(const char * dir, const char * parent, enum media_types dir_type)
 
 	for (i=0; i < n; i++)
 	{
+#if !USE_FORK
+		if( quitting )
+			break;
+#endif
 		type = TYPE_UNKNOWN;
 		sprintf(full_path, "%s/%s", dir, namelist[i]->d_name);
 		name = escape_tag(namelist[i]->d_name);