From 934cea560dea7bd58895751f2ce9256ea7441f03 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Mon, 6 May 2013 09:59:56 +0200
Subject: 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>
---
 src/plugins/cpptools/cpptoolseditorsupport.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

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
 {
-- 
cgit v1.2.1