From a93c3423e34f971116ae8623d1d3822d6931ab02 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 4 Jul 2014 18:06:40 +0900
Subject: [PATCH] must commit on concurrent update

---
 anki/sync.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/anki/sync.py b/anki/sync.py
index 46ac92ecd..baff048dc 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -799,9 +799,11 @@ class MediaSyncer(object):
 
             if serverLastUsn - processedCnt == lastUsn:
                 self.col.log("lastUsn in sync, updating local")
-                self.col.media.setLastUsn(serverLastUsn)
+                self.col.media.setLastUsn(serverLastUsn) # commits
             else:
                 self.col.log("concurrent update, skipping usn update")
+                # commit for markClean
+                self.col.media.db.commit()
                 updateConflict = True
 
         if updateConflict: