diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
| commit | ee2b1e71a80f88de90a03e10a89ba491ef99d308 (patch) | |
| tree | b14cd541a3f7ad1fc6739e0f5a02d479334b6b34 /src/core/url_request_context_getter_qt.cpp | |
| parent | 61bdfb046700068afe36007ede3dcba1104099a3 (diff) | |
| parent | 7db354d1a21a17da76244b77c35d7297be3a86a9 (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
Diffstat (limited to 'src/core/url_request_context_getter_qt.cpp')
| -rw-r--r-- | src/core/url_request_context_getter_qt.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp index ca79b55d4..f80aa194b 100644 --- a/src/core/url_request_context_getter_qt.cpp +++ b/src/core/url_request_context_getter_qt.cpp @@ -157,8 +157,11 @@ void URLRequestContextGetterQt::generateStorage() Q_ASSERT(m_urlRequestContext); // We must stop all requests before deleting their backends. - if (m_storage) + if (m_storage) { cancelAllUrlRequests(); + // we need to get rid of dangling pointer due to coming storage deletion + m_urlRequestContext->set_http_transaction_factory(0); + } m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get())); |