summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-09-01 10:51:38 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-09-01 09:56:58 +0000
commitbba90c3ea7c5aa5815fac271718191677a2da727 (patch)
tree4bcbbaf8b2f0a1bd8ab7f6a44bea8667a0ed8bef /src/core/web_engine_context.cpp
parentd7bde71b26cb174180ae76a389e9ec284f001f64 (diff)
fix crash on exit when using the inspector
Destroy the DevToolsHttpHandler early on, because ~DevToolsHttpHandler assumes the browser's UI thread is still running. This fixes a crash on exit in tst_inspectorserver. Change-Id: I98476231b709d60c249e58e17b09de70aed6792b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_context.cpp')
-rw-r--r--src/core/web_engine_context.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 727cfb491..4e4159cef 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -153,6 +153,7 @@ void WebEngineContext::destroy()
// Flush the UI message loop before quitting.
while (delegate->DoWork()) { }
GLContextHelper::destroy();
+ m_devtools.reset(0);
m_runLoop->AfterRun();
// Force to destroy RenderProcessHostImpl by destroying BrowserMainRunner.