diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:08:42 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:08:42 +0200 |
| commit | c32707148292d104c66276b43796d6057c8c7a5d (patch) | |
| tree | bb83513f4aff24153e21a4ec92e34e4c27651b1f /structures.cpp | |
| parent | 3.9 (diff) | |
| download | FreeFileSync-c32707148292d104c66276b43796d6057c8c7a5d.tar.gz FreeFileSync-c32707148292d104c66276b43796d6057c8c7a5d.tar.bz2 FreeFileSync-c32707148292d104c66276b43796d6057c8c7a5d.zip | |
3.10
Diffstat (limited to 'structures.cpp')
| -rw-r--r-- | structures.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/structures.cpp b/structures.cpp index 7515a0cc..ce41e93f 100644 --- a/structures.cpp +++ b/structures.cpp @@ -292,9 +292,9 @@ ffs3::MainConfiguration ffs3::merge(const std::vector<MainConfiguration>& mainCf if (fp->localFilter.includeFilter == FilterConfig().includeFilter) fp->localFilter.includeFilter = i->globalFilter.includeFilter; - fp->localFilter.excludeFilter.Trim(false); - fp->localFilter.excludeFilter = i->globalFilter.excludeFilter + DefaultStr("\n") + fp->localFilter.excludeFilter; - fp->localFilter.excludeFilter.Trim(false); + fp->localFilter.excludeFilter.Trim(true, false); + fp->localFilter.excludeFilter = i->globalFilter.excludeFilter + Zstr("\n") + fp->localFilter.excludeFilter; + fp->localFilter.excludeFilter.Trim(true, false); } fpMerged.insert(fpMerged.end(), fpTmp.begin(), fpTmp.end()); |