aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@theqtcompany.com>2015-09-04 15:41:28 +0200
committerRobert Loehning <robert.loehning@theqtcompany.com>2015-09-04 15:05:50 +0000
commitfcd59af30ff085cf51ec6b083d671e436377e4d3 (patch)
tree65923f5558c3651e8541854288c483bed4d236ac
parent43064aa50517cac50a4437b56e0d0aa1c2900677 (diff)
Completion: Fix crash in CodeAssistant
Task-number: QTCREATORBUG-15020 Change-Id: I88f166250b89badde2162e14065adfca05573dc7 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
-rw-r--r--src/plugins/texteditor/codeassist/codeassistant.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index ffe86295c2..cc247d1323 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -305,7 +305,7 @@ void CodeAssistantPrivate::proposalComputed()
{
// Since the request runner is a different thread, there's still a gap in which the queued
// signal could be processed after an invalidation of the current request.
- if (m_requestRunner != sender())
+ if (!m_requestRunner || m_requestRunner != sender())
return;
IAssistProposal *newProposal = m_requestRunner->proposal();