From 067ae2439b83997656e5fb1523809cd9e485ad28 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Tue, 19 Nov 2013 16:18:27 +0100
Subject: 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>
---
 src/plugins/cpptools/cpptoolseditorsupport.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')

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();
 }
-- 
cgit v1.2.1