if card is deleted while editing current, fetch next

This commit is contained in:
Damien Elmes 2012-04-17 22:09:58 +09:00
parent 2253b879de
commit 04ca160b5f

View file

@ -25,7 +25,6 @@ class EditCurrent(QDialog):
self.onSave) self.onSave)
self.editor = aqt.editor.Editor(self.mw, self.form.fieldsArea, self) self.editor = aqt.editor.Editor(self.mw, self.form.fieldsArea, self)
self.editor.setNote(self.mw.reviewer.card.note()) self.editor.setNote(self.mw.reviewer.card.note())
self.mw.reviewer.cardQueue.append(self.mw.reviewer.card)
restoreGeom(self, "editcurrent") restoreGeom(self, "editcurrent")
addHook("reset", self.onReset) addHook("reset", self.onReset)
self.mw.requireReset(modal=True) self.mw.requireReset(modal=True)
@ -44,7 +43,13 @@ class EditCurrent(QDialog):
self.editor.saveNow() self.editor.saveNow()
self.editor.setNote(None) self.editor.setNote(None)
r = self.mw.reviewer r = self.mw.reviewer
r.card.load() try:
r.card.load()
except TypeError:
# card was removed by clayout
pass
else:
self.mw.reviewer.cardQueue.append(self.mw.reviewer.card)
self.mw.moveToState("review") self.mw.moveToState("review")
saveGeom(self, "editcurrent") saveGeom(self, "editcurrent")
# close()ing immediately causes intermittent crashes on osx # close()ing immediately causes intermittent crashes on osx