Fixed a critical issue in the newly introduced file watcher handling introduced with ticket #397
Authored by: numere 2019-08-21
Parent: [r614]
Child: [r616]
