Merge 00683f5 into 8cd5f7a

index.js

@@ -699,7 +699,7 @@ FSWatcher.prototype.close = function() {
 
   this.closed = true;
   Object.keys(this._closers).forEach(function(watchPath) {
-    this._closers[watchPath]();
+    this._closers[watchPath](true);
     delete this._closers[watchPath];
   }, this);
   this._watched = Object.create(null);

lib/nodefs-handler.js

@@ -114,11 +114,14 @@ function setFsWatchListener(path, fullPath, options, handlers) {
 
   // removes this instance's listeners and closes the underlying fs.watch
   // instance if there are no more listeners left
-  return function close() {
+  return function close(force) {
     delete container.listeners[listenerIndex];
     delete container.errHandlers[listenerIndex];
     delete container.rawEmitters[listenerIndex];
-    if (!Object.keys(container.listeners).length) {
+    if (force) {
+      container.watcher.close();
+      delete FsWatchInstances[fullPath];
+    } else if (!Object.keys(container.listeners).length) {
       if (!container.watcherUnusable) { // check to protect against issue #730
         container.watcher.close();
       }
@@ -190,10 +193,10 @@ function setFsWatchFileListener(path, fullPath, options, handlers) {
 
   // removes this instance's listeners and closes the underlying fs.watchFile
   // instance if there are no more listeners left
-  return function close() {
+  return function close(force) {
     delete container.listeners[listenerIndex];
     delete container.rawEmitters[listenerIndex];
-    if (!Object.keys(container.listeners).length) {
+    if (force || !Object.keys(container.listeners).length) {
       fs.unwatchFile(fullPath);
       delete FsWatchFileInstances[fullPath];
     }