mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 22:12:21 -04:00
correctly detect when we don't have a deck conf
This commit is contained in:
parent
665fe9c280
commit
1800f30776
2 changed files with 4 additions and 2 deletions
|
@ -119,7 +119,6 @@ class MplayerMonitor(threading.Thread):
|
||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
self.deadPlayers = [pl for pl in self.deadPlayers if clean(pl)]
|
self.deadPlayers = [pl for pl in self.deadPlayers if clean(pl)]
|
||||||
mplayerEvt.clear()
|
|
||||||
|
|
||||||
def kill(self):
|
def kill(self):
|
||||||
if not self.mplayer:
|
if not self.mplayer:
|
||||||
|
|
|
@ -312,7 +312,10 @@ from notes where %s""" % d)
|
||||||
if not l or r['mod'] > l['mod']:
|
if not l or r['mod'] > l['mod']:
|
||||||
self.col.decks.update(r)
|
self.col.decks.update(r)
|
||||||
for r in rchg[1]:
|
for r in rchg[1]:
|
||||||
l = self.col.decks.getConf(r['id'])
|
try:
|
||||||
|
l = self.col.decks.getConf(r['id'])
|
||||||
|
except KeyError:
|
||||||
|
l = None
|
||||||
# if missing locally or server is newer, update
|
# if missing locally or server is newer, update
|
||||||
if not l or r['mod'] > l['mod']:
|
if not l or r['mod'] > l['mod']:
|
||||||
self.col.decks.updateConf(r)
|
self.col.decks.updateConf(r)
|
||||||
|
|
Loading…
Reference in a new issue