diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-05-22 17:03:17 -0400 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-05-22 17:03:17 -0400 |
| commit | 2c81be72eef5363736cf1892646c74a3311ee4c1 (patch) | |
| tree | 3894ba7e10c78750c195381a861da5e8166a6bfd /zen/dir_watcher.cpp | |
| parent | Merge branch 'b11.20' into 'master' (diff) | |
| download | FreeFileSync-2c81be72eef5363736cf1892646c74a3311ee4c1.tar.gz FreeFileSync-2c81be72eef5363736cf1892646c74a3311ee4c1.tar.bz2 FreeFileSync-2c81be72eef5363736cf1892646c74a3311ee4c1.zip | |
add upstream 11.21b11.21
Diffstat (limited to 'zen/dir_watcher.cpp')
| -rw-r--r-- | zen/dir_watcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/dir_watcher.cpp b/zen/dir_watcher.cpp index 191ffd64..c48928a3 100644 --- a/zen/dir_watcher.cpp +++ b/zen/dir_watcher.cpp @@ -24,7 +24,7 @@ using namespace zen; struct DirWatcher::Impl { int notifDescr = 0; - std::map<int, Zstring> watchedPaths; //watch descriptor and (sub-)directory paths -> owned by "notifDescr" + std::unordered_map<int, Zstring> watchedPaths; //watch descriptor and (sub-)directory paths -> owned by "notifDescr" }; @@ -133,7 +133,7 @@ std::vector<DirWatcher::Change> DirWatcher::fetchChanges(const std::function<voi { //Note: evt.len is NOT the size of the evt.name c-string, but the array size including all padding 0 characters! //It may be even 0 in which case evt.name must not be used! - const Zstring itemPath = appendSeparator(it->second) + evt.name; + const Zstring itemPath = appendPath(it->second, evt.name); if ((evt.mask & IN_CREATE) || (evt.mask & IN_MOVED_TO)) |