diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-08 07:36:31 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-08 07:36:36 +0200 |
| commit | c6125f279063366ada1c32d76018a2f7c722abf0 (patch) | |
| tree | b7c4db3755adb5404d753df5f05251bad0f8fb4b /src/plugins/texteditor | |
| parent | 9e2c0f55f2888afda5c40988653feeac8bdbf5c0 (diff) | |
| parent | 7dbea56b9c1ca41fb0408689a73f61a4c59ff962 (diff) | |
| download | qt-creator-c6125f279063366ada1c32d76018a2f7c722abf0.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I8cc26f38a0ac2453c81108e449b6d84efc9e419c
Diffstat (limited to 'src/plugins/texteditor')
| -rw-r--r-- | src/plugins/texteditor/codeassist/codeassistant.cpp | 2 |
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(); |