diff options
| author | B Stack <bgstack15@gmail.com> | 2020-04-21 13:27:40 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-04-21 13:27:40 +0000 |
| commit | edbfd7e2c82b9b72af429a0af15fb4685987b80a (patch) | |
| tree | 73ef81c5517422a357ea495b4d09193998fd0d01 /freefilesync/ffs_no_eraseif.patch | |
| parent | improve pm/wf prefs.js (diff) | |
| parent | git stupidity (diff) | |
| download | stackrpms-edbfd7e2c82b9b72af429a0af15fb4685987b80a.tar.gz stackrpms-edbfd7e2c82b9b72af429a0af15fb4685987b80a.tar.bz2 stackrpms-edbfd7e2c82b9b72af429a0af15fb4685987b80a.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.23
See merge request bgstack15/stackrpms!151
Diffstat (limited to 'freefilesync/ffs_no_eraseif.patch')
| -rw-r--r-- | freefilesync/ffs_no_eraseif.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/freefilesync/ffs_no_eraseif.patch b/freefilesync/ffs_no_eraseif.patch index 1df8ef5..d20fd81 100644 --- a/freefilesync/ffs_no_eraseif.patch +++ b/freefilesync/ffs_no_eraseif.patch @@ -185,15 +185,15 @@ diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source cfg.directories.assign(uniqueFolders.begin(), uniqueFolders.end()); cfg.commandline = Zstr('"') + fff::getFreeFileSyncLauncherPath() + Zstr("\" \"") + filePath + Zstr('"'); } -diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source/RealTimeSync/monitor.cpp 10.18-2/FreeFileSync/Source/RealTimeSync/monitor.cpp ---- 10.18-1/FreeFileSync/Source/RealTimeSync/monitor.cpp 2019-11-20 16:15:55.822668055 -0500 -+++ 10.18-2/FreeFileSync/Source/RealTimeSync/monitor.cpp 2019-11-20 17:57:30.560558406 -0500 -@@ -163,7 +163,7 @@ - { - std::vector<DirWatcher::Entry> changedItems = watcher->getChanges([&] { requestUiUpdate(false /*readyForSync*/); /*throw X*/ }, - cbInterval); //throw FileError -- std::erase_if(changedItems, [](const DirWatcher::Entry& e) -+ eraseIf(changedItems, [](const DirWatcher::Entry& e) +diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.23-0/FreeFileSync/Source/RealTimeSync/monitor.cpp 10.23-1/FreeFileSync/Source/RealTimeSync/monitor.cpp +--- 10.23-0/FreeFileSync/Source/RealTimeSync/monitor.cpp 2020-04-21 08:03:55.508842092 -0400 ++++ 10.23-1/FreeFileSync/Source/RealTimeSync/monitor.cpp 2020-04-21 09:10:54.765302811 -0400 +@@ -152,7 +152,7 @@ + if (change.type == DirWatcher::ChangeType::baseFolderUnavailable) + return change; + +- std::erase_if(changes, [](const DirWatcher::Change& e) ++ eraseIf(changes, [](const DirWatcher::Change& e) { return endsWith(e.itemPath, Zstr(".ffs_tmp")) || //sync.8ea2.ffs_tmp |