From fecbe76d6e24c4025cf8efb012571d1535a938ff Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 18 Nov 2015 11:03:20 +0100 Subject: winrt: no assert when device is in airplane mode/has no internet connection Task-number: QTBUG-49478 Change-Id: I1b95ca736d454f82f84374554e6cdec2555d29de Reviewed-by: Andrew Knight --- src/network/kernel/qnetworkinterface_winrt.cpp | 3 +++ src/plugins/bearer/generic/qgenericengine.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/network/kernel/qnetworkinterface_winrt.cpp b/src/network/kernel/qnetworkinterface_winrt.cpp index 6791caaf21..1945b2427f 100644 --- a/src/network/kernel/qnetworkinterface_winrt.cpp +++ b/src/network/kernel/qnetworkinterface_winrt.cpp @@ -76,6 +76,9 @@ static QNetworkInterfacePrivate *interfaceFromProfile(IConnectionProfile *profil ComPtr adapter; hr = profile->get_NetworkAdapter(&adapter); + // Indicates that no internet connection is available/the device is in airplane mode + if (hr == E_INVALIDARG) + return 0; Q_ASSERT_SUCCEEDED(hr); UINT32 type; hr = adapter->get_IanaInterfaceType(&type); diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index 7f56846179..1e424dc223 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -201,6 +201,9 @@ static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interf ComPtr adapter; hr = profile->get_NetworkAdapter(&adapter); + // Indicates that no internet connection is available/the device is in airplane mode + if (hr == E_INVALIDARG) + return QNetworkConfiguration::BearerUnknown; Q_ASSERT_SUCCEEDED(hr); GUID id; hr = adapter->get_NetworkAdapterId(&id); -- cgit v1.2.3