ensure folders are watched after interrupting the dirwatcher
This adds a failsafe and generates a warning for a situation that should never happen. A spin-off of patch review D7995 on phabricator.