diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-11-19 16:18:27 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-11-20 11:30:12 +0100 |
| commit | 067ae2439b83997656e5fb1523809cd9e485ad28 (patch) | |
| tree | 2960171a073c7537a71ea66f3145cc712a9c96c8 /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | e4dd8e75d1fed57750c0fefca7e006c303d28317 (diff) | |
| download | qt-creator-067ae2439b83997656e5fb1523809cd9e485ad28.tar.gz | |
CppTools: Fix crash on shutdown
We need to wait for the document parser, otherwise the CppModelManager
object might get destroyed first and will be referenced later in
CppEditorSupport::parse().
Change-Id: I1b591640c1da3e63e49ac0b4b8af41aae31b3d43
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 89e787d081..85c304cad6 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -169,6 +169,7 @@ CppEditorSupport::~CppEditorSupport() m_highlighter.cancel(); m_futureSemanticInfo.cancel(); + m_documentParser.waitForFinished(); m_highlighter.waitForFinished(); m_futureSemanticInfo.waitForFinished(); } |