From 5fc33ab143132a98ad2bc850d02f487d0f25994f Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 19 Aug 2010 12:02:02 +0900 Subject: [PATCH] don't report conflicts when decks have same mod time --- ankiqt/ui/sync.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ankiqt/ui/sync.py b/ankiqt/ui/sync.py index 0c400c32a..f3f275c3b 100755 --- a/ankiqt/ui/sync.py +++ b/ankiqt/ui/sync.py @@ -159,7 +159,8 @@ class Sync(QThread): remoteSync = proxy._lastSync() minSync = min(localSync, remoteSync) self.conflictResolution = None - if minSync > 0 and localMod > minSync and remoteMod > minSync: + if (localMod != remoteMod and minSync > 0 and + localMod > minSync and remoteMod > minSync): self.emit(SIGNAL("syncConflicts"), syncName) while not self.conflictResolution: time.sleep(0.2)