correctly detect when we don't have a deck conf

This commit is contained in:
Damien Elmes 2012-01-30 07:31:15 +09:00
parent 665fe9c280
commit 1800f30776
2 changed files with 4 additions and 2 deletions

View file

@ -119,7 +119,6 @@ class MplayerMonitor(threading.Thread):
else:
return True
self.deadPlayers = [pl for pl in self.deadPlayers if clean(pl)]
mplayerEvt.clear()
def kill(self):
if not self.mplayer:

View file

@ -312,7 +312,10 @@ from notes where %s""" % d)
if not l or r['mod'] > l['mod']:
self.col.decks.update(r)
for r in rchg[1]:
try:
l = self.col.decks.getConf(r['id'])
except KeyError:
l = None
# if missing locally or server is newer, update
if not l or r['mod'] > l['mod']:
self.col.decks.updateConf(r)