From e2944695210f24184616fb43b75e616bc0a6e337 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 6 Nov 2014 16:56:16 +0900
Subject: [PATCH] cont should be checked befoer any further processing

---
 anki/sync.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/anki/sync.py b/anki/sync.py
index 229ac4e5b..92dd506bd 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -111,6 +111,13 @@ class Syncer(object):
         self.col.log("rmeta", meta)
         if not meta:
             return "badAuth"
+        # server requested abort?
+        if not meta['cont']:
+            return "serverAbort"
+        else:
+            # don't abort, but if 'msg' is not blank, gui should show 'msg'
+            # after sync finishes and wait for confirmation before hiding
+            pass
         rscm = meta['scm']
         rts = meta['ts']
         self.rmod = meta['mod']
@@ -121,13 +128,6 @@ class Syncer(object):
         # forgetting which email address they've used - it will be removed
         # when enough time has passed
         self.uname = meta.get("uname", "")
-        # server requested abort?
-        if not meta['cont']:
-            return "serverAbort"
-        else:
-            # don't abort, but ui should show message after sync finishes
-            # and require confirmation if it's non-empty
-            pass
         meta = self.meta()
         self.col.log("lmeta", meta)
         self.lmod = meta['mod']