Merge pull request #583 from Arthur-Milchior/remove_a_try

Simplify the code slightly
This commit is contained in:
Damien Elmes 2020-04-27 19:12:00 +10:00 committed by GitHub
commit e9ca61d1eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -123,14 +123,9 @@ class AddCards(QDialog):
if oldNote: if oldNote:
if not keep: if not keep:
self.removeTempNote(oldNote) self.removeTempNote(oldNote)
for n in range(len(note.fields)): for n in range(len(min(note.fields, oldNote.fields))):
try: if not keep or flds[n]["sticky"]:
if not keep or flds[n]["sticky"]: note.fields[n] = oldNote.fields[n]
note.fields[n] = oldNote.fields[n]
else:
note.fields[n] = ""
except IndexError:
break
self.setAndFocusNote(note) self.setAndFocusNote(note)
def removeTempNote(self, note: Note) -> None: def removeTempNote(self, note: Note) -> None: