From 5bb3214e6d4ea17e7b2e67d2f6f7913443c0069d Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Mon, 18 Nov 2024 14:53:51 +0100
Subject: [PATCH] TextEditor: Fix possible nullptr disconnect

Change-Id: I71340f38802d3e598c157cee628386ab78f69054
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/texteditor/codeassist/codeassistant.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 1cab9f82924..83eb9c7d13d 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -367,9 +367,14 @@ QString CodeAssistantPrivate::proposalPrefix() const
 void CodeAssistantPrivate::invalidateCurrentRequestData()
 {
     m_processor = nullptr;
-    disconnect(
-        m_requestProvider, &QObject::destroyed, this, &CodeAssistantPrivate::cancelCurrentRequest);
-    m_requestProvider = nullptr;
+    if (m_requestProvider) {
+        disconnect(
+            m_requestProvider,
+            &QObject::destroyed,
+            this,
+            &CodeAssistantPrivate::cancelCurrentRequest);
+        m_requestProvider = nullptr;
+    }
     m_receivedContentWhileWaiting = false;
 }