diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-06 09:59:56 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-05-08 10:29:10 +0200 |
| commit | 934cea560dea7bd58895751f2ce9256ea7441f03 (patch) | |
| tree | 7037156eef48a343d886b99cf98ca7fe10ec35d9 /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | 1e187f177a0efdd5420535996142856ba8c89db3 (diff) | |
| download | qt-creator-934cea560dea7bd58895751f2ce9256ea7441f03.tar.gz | |
CppEditor: Fix crash when closing editors fast
Task-number: QTCREATORBUG-9250
Change-Id: I15bcaf5d0e55c7e3cc731755fc48df2d1181f3da
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 2554a9db3c..01001fee76 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -143,7 +143,13 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor } CppEditorSupport::~CppEditorSupport() -{ } +{ + m_highlighter.cancel(); + m_futureSemanticInfo.cancel(); + + m_highlighter.waitForFinished(); + m_futureSemanticInfo.waitForFinished(); +} QString CppEditorSupport::fileName() const { |