summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2019-06-24 12:52:38 +0200
committerOliver Wolff <oliver.wolff@qt.io>2019-06-24 13:04:05 +0200
commit7df7bc13f1b483504b01685888d3e3b6b6224a87 (patch)
tree151d4adde18d3f357089cdfc81110e073c5f98ab
parent2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452 (diff)
downloadqtlocation-7df7bc13f1b483504b01685888d3e3b6b6224a87.tar.gz
winrt: Do not assert if requesting access failed
On Windows 8.1 accessing geolocation statics fails. If this happens, the function should not assert/crash, but just return false. Fixes: QTBUG-76344 Change-Id: I2dbd4734512f731ef065ec1e1e210fc22e057547 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index 821d2e9f..1c448bc2 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -655,7 +655,10 @@ bool QGeoPositionInfoSourceWinRT::requestAccess() const
hr = statics->RequestAccessAsync(&op);
return hr;
});
- Q_ASSERT_SUCCEEDED(hr);
+ if (FAILED(hr)) {
+ qCDebug(lcPositioningWinRT) << __FUNCTION__ << "Requesting access from Xaml thread failed";
+ return false;
+ }
// We cannot wait inside the XamlThread as that would deadlock
#ifdef Q_OS_WINRT