From d427e1028b87c34b51f31220385abd018676b068 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Sun, 26 Apr 2020 16:52:35 +0200 Subject: [PATCH] single try in onModelChange --- qt/aqt/addcards.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py index ed725c50a..513f4b199 100644 --- a/qt/aqt/addcards.py +++ b/qt/aqt/addcards.py @@ -100,17 +100,15 @@ class AddCards(QDialog): newFields = list(note.keys()) for n, f in enumerate(note.model()["flds"]): fieldName = f["name"] - try: - oldFieldName = oldNote.model()["flds"][n]["name"] - except IndexError: - oldFieldName = None # copy identical fields if fieldName in oldFields: note[fieldName] = oldNote[fieldName] - # set non-identical fields by field index - elif oldFieldName and oldFieldName not in newFields: + else: + # set non-identical fields by field index try: - note.fields[n] = oldNote.fields[n] + oldFieldName = oldNote.model()["flds"][n]["name"] + if oldFieldName not in newFields: + note.fields[n] = oldNote.fields[n] except IndexError: pass self.removeTempNote(oldNote)