From 1ed6674d1ec88b36ee97b47f82168d868ded26ea Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Tue, 21 Nov 2023 18:28:41 +0100 Subject: [PATCH] QmlDesigner: Fix crash in QmlDesigner::TextEditor Change-Id: Ic511e5812bbe015f90f88f947faa50bb3461ae38 Reviewed-by: Tim Jenssen --- .../components/texteditor/texteditorwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp index fa639c39a01..97ef6c4b689 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp @@ -78,10 +78,6 @@ void TextEditorWidget::setTextEditor( }); m_textEditor->editorWidget()->installEventFilter(this); - // do not call the eventfilter when the m_textEditor is gone - connect(m_textEditor->editorWidget(), &QObject::destroyed, this, [this](QObject *) { - m_textEditor->editorWidget()->removeEventFilter(this); - }); } } @@ -206,6 +202,10 @@ void TextEditorWidget::setBlockCursorSelectionSynchronisation(bool b) bool TextEditorWidget::eventFilter(QObject *, QEvent *event) { + //do not call the eventfilter when the m_textEditor is gone + if (!TextEditor::TextEditorWidget::fromEditor(m_textEditor.get())) + return false; + static std::vector overrideKeys = { Qt::Key_Delete, Qt::Key_Backspace, Qt::Key_Insert, Qt::Key_Escape };