From e50d40cedf39bcc2d7f3effa529e909e7fb387d2 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 25 May 2022 22:04:50 +1000 Subject: [PATCH] Make editor.cleanup() idempotent Hammering the esc key as a dialog loads can cause it to be run more than once, leading to an error message. --- qt/aqt/editor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index 6c8ce673e..a03483e65 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -627,8 +627,9 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too def cleanup(self) -> None: self.set_note(None) # prevent any remaining evalWithCallback() events from firing after C++ object deleted - self.web.cleanup() - self.web = None + if self.web: + self.web.cleanup() + self.web = None # legacy