GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 14:32:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

don't report conflicts when decks have same mod time

Browse source
This commit is contained in:
Damien Elmes 2010-08-19 12:02:02 +09:00
parent a4e3a9fa95
commit 5fc33ab143
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ankiqt/ui/sync.py
View file

@ -159,7 +159,8 @@ class Sync(QThread):
remoteSync = proxy._lastSync() remoteSync = proxy._lastSync()
minSync = min(localSync, remoteSync) minSync = min(localSync, remoteSync)
self.conflictResolution = None 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) self.emit(SIGNAL("syncConflicts"), syncName)
while not self.conflictResolution: while not self.conflictResolution:
time.sleep(0.2) time.sleep(0.2)