diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2015-07-08 14:18:50 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2015-07-14 11:49:52 +0000 |
| commit | bf784bdf4350c178f030d34532fdd33953dac95a (patch) | |
| tree | d8dc1804352058405961dbb26809744cc8c29e85 /src/core/content_browser_client_qt.cpp | |
| parent | 7345ef65af262eb0b958905d7175cc836821cf25 (diff) | |
Fix single-process mode
Destroy RenderprocesHostimpl first then the WebEngineContext.
RenderProcessHostImpl's destructor may use the default BrowserContext
stored by the WebEngineContext.
Task-number: QTBUG-45722
Change-Id: Ide8875a89bd339ecf65ddd32a5f00842102c1c43
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 3d318047b..fdfbaf0f5 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -71,6 +71,7 @@ #include "resource_dispatcher_host_delegate_qt.h" #include "user_script_controller_host.h" #include "web_contents_delegate_qt.h" +#include "web_engine_context.h" #include "web_engine_library_info.h" #include <QGuiApplication> @@ -218,6 +219,9 @@ public: void PostMainMessageLoopRun() { + // The BrowserContext's destructor uses the MessageLoop so it should be deleted + // right before the RenderProcessHostImpl's destructor destroys it. + WebEngineContext::current()->destroyBrowserContext(); } int PreCreateThreads() Q_DECL_OVERRIDE |