diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:18 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:18 +0200 |
| commit | bcc5cc28c6dc5178e8f4fd0cc521034ae5def388 (patch) | |
| tree | bacc60d27b435d32172f97643576c5e4e953177d /lib/db_file.cpp | |
| parent | 5.9 (diff) | |
| download | FreeFileSync-bcc5cc28c6dc5178e8f4fd0cc521034ae5def388.tar.gz FreeFileSync-bcc5cc28c6dc5178e8f4fd0cc521034ae5def388.tar.bz2 FreeFileSync-bcc5cc28c6dc5178e8f4fd0cc521034ae5def388.zip | |
5.10
Diffstat (limited to 'lib/db_file.cpp')
| -rw-r--r-- | lib/db_file.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/db_file.cpp b/lib/db_file.cpp index 53830afe..f81ada21 100644 --- a/lib/db_file.cpp +++ b/lib/db_file.cpp @@ -636,12 +636,12 @@ std::shared_ptr<InSyncDir> zen::loadLastSynchronousState(const BaseDirMapping& b const Zstring fileNameLeft = getDBFilename<LEFT_SIDE >(baseMapping); const Zstring fileNameRight = getDBFilename<RIGHT_SIDE>(baseMapping); - if (!baseMapping.wasExisting<LEFT_SIDE >() || - !baseMapping.wasExisting<RIGHT_SIDE>()) + if (!baseMapping.isExisting<LEFT_SIDE >() || + !baseMapping.isExisting<RIGHT_SIDE>()) { //avoid race condition with directory existence check: reading sync.ffs_db may succeed although first dir check had failed => conflicts! //https://sourceforge.net/tracker/?func=detail&atid=1093080&aid=3531351&group_id=234430 - const Zstring filename = !baseMapping.wasExisting<LEFT_SIDE>() ? fileNameLeft : fileNameRight; + const Zstring filename = !baseMapping.isExisting<LEFT_SIDE>() ? fileNameLeft : fileNameRight; throw FileErrorDatabaseNotExisting(_("Initial synchronization:") + L" \n" + //it could be due to a to-be-created target directory not yet existing => FileErrorDatabaseNotExisting replaceCpy(_("Database file %x does not yet exist."), L"%x", fmtFileName(filename))); } |