make sure to save facts before closing editor, etc

ankiqt/ui/addcards.py

@@ -90,8 +90,7 @@ class AddCards(QDialog):
 
     def addCards(self):
         # make sure updated
-        w = self.editor.focusedEdit()
-        self.addButton.setFocus()
+        self.editor.saveFieldsNow()
         fact = self.editor.fact
         try:
             cards = self.parent.deck.addFact(fact)

ankiqt/ui/cardlist.py

@@ -631,6 +631,7 @@ where id in (%s)""" % ",".join([
         self.updateAfterCardChange(reset=True)
 
     def accept(self):
+        self.editor.saveFieldsNow()
         self.hide()
         self.deck.deleteCards(self.model.deleted.keys())
         if len(self.model.deleted):

ankiqt/ui/facteditor.py

@@ -37,6 +37,9 @@ class FactEditor(object):
         "Make FACT the current fact."
         self.fact = fact
         self.factState = None
+        if self.changeTimer:
+            self.changeTimer.stop()
+            self.changeTimer = None
         if self.needToRedraw():
             self.drawFields(noFocus, check)
         else:
@@ -330,6 +333,21 @@ class FactEditor(object):
             self.onChange()
         self.changeTimer = None
 
+    def saveFieldsNow(self):
+        "Must call this before adding cards, closing dialog, etc."
+        # disable timer
+        if self.changeTimer:
+            self.changeTimer.stop()
+            self.changeTimer = None
+            if self.onChange:
+                self.onChange()
+        # save fields and run features
+        w = self.focusedEdit()
+        if w:
+            self.onFocusLost(w)
+        # ensure valid
+        self.checkValid()
+
     def checkValid(self):
         empty = []
         dupe = []

ankiqt/ui/main.py

@@ -201,6 +201,7 @@ class AnkiQt(QMainWindow):
             self.mainWin.fieldsArea.show()
             self.editor.setFact(self.currentCard.fact)
         elif state == "saveEdit":
+            self.editor.saveFieldsNow()
             self.deck.s.flush()
             return self.moveToState("auto")
         self.updateViews(state)