From 4226e548662339ea1ca37b45385a7cf9b237ff1e Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:07:43 +0200 Subject: 3.8 --- structures.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'structures.cpp') 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: -- cgit