diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:07:43 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:07:43 +0200 |
| commit | 4226e548662339ea1ca37b45385a7cf9b237ff1e (patch) | |
| tree | 9a3fa54b85d97f05164e41bdb96b82f748a37342 /structures.cpp | |
| parent | 3.7 (diff) | |
| download | FreeFileSync-4226e548662339ea1ca37b45385a7cf9b237ff1e.tar.gz FreeFileSync-4226e548662339ea1ca37b45385a7cf9b237ff1e.tar.bz2 FreeFileSync-4226e548662339ea1ca37b45385a7cf9b237ff1e.zip | |
3.8
Diffstat (limited to 'structures.cpp')
| -rw-r--r-- | structures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/structures.cpp b/structures.cpp index 90863a41..177bfa1b 100644 --- a/structures.cpp +++ b/structures.cpp @@ -87,7 +87,7 @@ SyncConfiguration::Variant FreeFileSync::getVariant(const SyncConfiguration& syn syncCfg.exRightSideOnly == SYNC_DIR_NONE && syncCfg.leftNewer == SYNC_DIR_RIGHT && syncCfg.rightNewer == SYNC_DIR_NONE && - syncCfg.different == SYNC_DIR_NONE && + syncCfg.different == SYNC_DIR_RIGHT && syncCfg.conflict == SYNC_DIR_NONE) return SyncConfiguration::UPDATE; //Update -> else @@ -117,7 +117,7 @@ void FreeFileSync::setVariant(SyncConfiguration& syncCfg, const SyncConfiguratio syncCfg.exRightSideOnly = SYNC_DIR_NONE; syncCfg.leftNewer = SYNC_DIR_RIGHT; syncCfg.rightNewer = SYNC_DIR_NONE; - syncCfg.different = SYNC_DIR_NONE; + syncCfg.different = SYNC_DIR_RIGHT; syncCfg.conflict = SYNC_DIR_NONE; break; case SyncConfiguration::CUSTOM: |