From 5bdd20a085f286d23ef07d0c48c4aa3bc83d57b7 Mon Sep 17 00:00:00 2001 From: Martin Petersson Date: Fri, 6 Jan 2012 09:51:53 +0100 Subject: QNetworkAccessManager: check if networksession is set Need to check that the networkSession has been set so we don't crash when bearermanagement is enabled. Task-number: QTBUG-23484 Change-Id: Ifdb71350ba5b4ddbdbd17a8d87189c78c524783e Reviewed-by: Aaron Kennedy Reviewed-by: Peter Hartmann --- src/network/access/qhttpnetworkconnection.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/network') diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 4bbfa4740b..c9a41176d6 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -1050,14 +1050,16 @@ void QHttpNetworkConnectionPrivate::startNetworkLayerStateLookup() int timeout = 300; #ifndef QT_NO_BEARERMANAGEMENT - if (networkSession->configuration().bearerType() == QNetworkConfiguration::Bearer2G) - timeout = 800; - else if (networkSession->configuration().bearerType() == QNetworkConfiguration::BearerCDMA2000) - timeout = 500; - else if (networkSession->configuration().bearerType() == QNetworkConfiguration::BearerWCDMA) - timeout = 500; - else if (networkSession->configuration().bearerType() == QNetworkConfiguration::BearerHSPA) - timeout = 400; + if (networkSession) { + if (networkSession->configuration().bearerType() == QNetworkConfiguration::Bearer2G) + timeout = 800; + else if (networkSession->configuration().bearerType() == QNetworkConfiguration::BearerCDMA2000) + timeout = 500; + else if (networkSession->configuration().bearerType() == QNetworkConfiguration::BearerWCDMA) + timeout = 500; + else if (networkSession->configuration().bearerType() == QNetworkConfiguration::BearerHSPA) + timeout = 400; + } #endif delayedConnectionTimer.start(timeout); if (delayIpv4) -- cgit v1.2.3