move sync on load to after deck load

This commit is contained in:
Damien Elmes 2009-03-22 11:42:14 +09:00
parent dee16171ea
commit 57f655c119

View file

@ -84,6 +84,9 @@ class AnkiQt(QMainWindow):
ui.splash.update() ui.splash.update()
ui.splash.finish(self) ui.splash.finish(self)
self.show() self.show()
if (self.deck and self.config['syncOnLoad'] and
self.deck.syncName):
self.syncDeck(interactive=False)
def setupMainWindow(self): def setupMainWindow(self):
# main window # main window
@ -617,10 +620,10 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
# try a command line argument if available # try a command line argument if available
if args: if args:
f = unicode(args[0], sys.getfilesystemencoding()) f = unicode(args[0], sys.getfilesystemencoding())
return self.loadDeck(f) return self.loadDeck(f, sync=False)
# try recent deck paths # try recent deck paths
for path in self.config['recentDeckPaths']: for path in self.config['recentDeckPaths']:
r = self.loadDeck(path, interactive=False) r = self.loadDeck(path, interactive=False, sync=False)
if r: if r:
return r return r
self.onNew(initial=True) self.onNew(initial=True)