add upstream 12.0

1 files changed, 8 insertions, 5 deletions

diff --git a/zen/dir_watcher.cpp b/zen/dir_watcher.cpp
index e0b4a338..235c466c 100644
--- a/zen/dir_watcher.cpp
+++ b/zen/dir_watcher.cpp
@@ -37,15 +37,18 @@ DirWatcher::DirWatcher(const Zstring& dirPath) : //throw FileError
     {
         std::function<void(const Zstring& path)> traverse;
 
-        traverse = [&traverse, &fullFolderList](const Zstring& path)
+        traverse = [&traverse, &fullFolderList](const Zstring& path) //throw FileError
         {
             traverseFolder(path, nullptr,
-            [&](const FolderInfo& fi ) { fullFolderList.push_back(fi.fullPath); traverse(fi.fullPath); },
-            nullptr, //don't traverse into symlinks (analog to windows build)
-            [&](const std::wstring& errorMsg) { throw FileError(errorMsg); });
+            [&](const FolderInfo& fi )
+                {
+                    fullFolderList.push_back(fi.fullPath);
+                    traverse(fi.fullPath); //throw FileError
+                },
+            nullptr /*don't traverse into symlinks (analog to Windows)*/); //throw FileError
         };
 
-        traverse(baseDirPath_);
+        traverse(baseDirPath_); //throw FileError
     }
 
     //init