diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:05:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:05:05 +0200 |
| commit | c1ef8fde53c9434cb2effacd92915e7c39d5c39b (patch) | |
| tree | 2b499581f88c2a6dce82644a0332fcb77eb03941 /src/plugins/position | |
| parent | 74079bebbe44c51ab65924ee4c7e898ddf388b1c (diff) | |
| parent | 3833e418682331cc76bfc287ae818557bdac447c (diff) | |
| download | qtlocation-c1ef8fde53c9434cb2effacd92915e7c39d5c39b.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia8e0d53bff9f4df0897bb77e75f427acb65f5da7
Diffstat (limited to 'src/plugins/position')
| -rw-r--r-- | src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 5 |
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 7df49307..a9cc164f 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 |