diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-24 15:16:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-01 11:50:03 +0200 |
| commit | 93e1b97b78595ba904664dbd7fee5cde3df4e977 (patch) | |
| tree | 941de3268ce817f709cb36c28a183e2d96635ca0 /src/core/proxy_config_service_qt.cpp | |
| parent | 094844dacd40b37e0233d7fb185caff88e31f004 (diff) | |
Avoid assert in proxy resolution
QtWebEngine triggers asserts on Windows due to OnProxyConfigChanged
called with a still pending configuration.
Change-Id: I835860507c17110e642f3fa0628b5f7cb531e0e4
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/proxy_config_service_qt.cpp')
| -rw-r--r-- | src/core/proxy_config_service_qt.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/proxy_config_service_qt.cpp b/src/core/proxy_config_service_qt.cpp index 14e386a34..933b1a10e 100644 --- a/src/core/proxy_config_service_qt.cpp +++ b/src/core/proxy_config_service_qt.cpp @@ -168,6 +168,8 @@ void ProxyConfigServiceQt::OnProxyConfigChanged(const net::ProxyConfig &config, || m_qtApplicationProxy.type() == QNetworkProxy::NoProxy) { net::ProxyConfig actual_config; availability = GetLatestProxyConfig(&actual_config); + if (availability == CONFIG_PENDING) + return; FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, m_observers, OnProxyConfigChanged(actual_config, availability)); } |