Merge 3edd5c5 into 76b0e4a

lib/DirectoryWatcher.js

@@ -332,6 +332,14 @@ class DirectoryWatcher extends EventEmitter {
 
 	onWatchEvent(eventType, filename) {
 		if(this.closed) return;
+		if(!filename) {
+			// In some cases no filename is provided
+			// This seem to happen on windows
+			// So some event happened but we don't know which file is affected
+			// We have to do a full scan of the directory
+			this.doScan(false);
+			return;
+		}
 		if(this._activeEvents.get(filename) === undefined) {
 			this._activeEvents.set(filename, false);
 			const checkStats = () => {
@@ -494,6 +502,12 @@ class DirectoryWatcher extends EventEmitter {
 					this.setMissing(file, initial, "scan (missing)");
 				}
 			}
+			if(this.scanAgain) {
+				// Early repeat of scan
+				this.scanAgain = false;
+				this.doScan(initial);
+				return;
+			}
 			async.forEach(itemPaths, (itemPath, callback) => {
 				fs.stat(itemPath, (err2, stats) => {
 					if(this.closed) return;