always reset on clayout exit, unless we're calling hooks

This commit is contained in:
Damien Elmes 2010-12-11 20:58:57 +09:00
parent b6fb2098e6
commit bcbea7ab3f

View file

@ -277,6 +277,7 @@ order by n""", id=card.id)
modified = False modified = False
self.deck.startProgress() self.deck.startProgress()
self.deck.updateProgress(_("Applying changes...")) self.deck.updateProgress(_("Applying changes..."))
reset=True
if self.needFormatRebuild: if self.needFormatRebuild:
# need to generate q/a templates # need to generate q/a templates
self.deck.updateCardsFromModel(self.fact.model) self.deck.updateCardsFromModel(self.fact.model)
@ -292,7 +293,8 @@ order by n""", id=card.id)
self.deck.flushMod() self.deck.flushMod()
if self.factedit and self.factedit.onChange: if self.factedit and self.factedit.onChange:
self.factedit.onChange("all") self.factedit.onChange("all")
else: reset=False
if reset:
self.mw.reset() self.mw.reset()
self.deck.finishProgress() self.deck.finishProgress()
saveGeom(self, "CardLayout") saveGeom(self, "CardLayout")