feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Reset completion view before aborting

Browse Source 
...otherwise subsequent events (e.g. Return) might trigger functions
operating on an invalid model index (see activateCurrentProposalItem).

Task-number: QTCREATORBUG-10589

Change-Id: Ib3e37c8c85c882135970d5d9418d6e69917494c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-11-05 13:55:16 +01:00
parent 9a0af7f20b
commit 25c21b3517
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -443,6 +443,7 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix)
if (d->m_model->size() == 0 if (d->m_model->size() == 0
|| (!d->m_model->keepPerfectMatch(d->m_reason) || (!d->m_model->keepPerfectMatch(d->m_reason)
&& isPerfectMatch(prefix, d->m_model))) { && isPerfectMatch(prefix, d->m_model))) {
d->m_completionListView->reset();
abort(); abort();
return false; return false;
} }
@@ -474,6 +475,7 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix)
if (d->m_model->size() == 1) { if (d->m_model->size() == 1) {
IAssistProposalItem *item = d->m_model->proposalItem(0); IAssistProposalItem *item = d->m_model->proposalItem(0);
if (item->implicitlyApplies()) { if (item->implicitlyApplies()) {
d->m_completionListView->reset();
abort(); abort();
emit proposalItemActivated(item); emit proposalItemActivated(item);
return false; return false;