diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:13 +0100 |
| commit | ebd9e3b1f874b5d6b062914947a3de9954862066 (patch) | |
| tree | 14ba5b2db92e9e9b88c524cd641545fff9fdfdcf /src/plugins/position/winrt | |
| parent | 265f2b75b86337287880290593b3c411ad5fa7a1 (diff) | |
| parent | dc384a2376a13ae2a8776ea0eda7d6e2fd088a64 (diff) | |
| download | qtlocation-ebd9e3b1f874b5d6b062914947a3de9954862066.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia0a66c229f249532e70b1548f5e618e4db4bc5ad
Diffstat (limited to 'src/plugins/position/winrt')
| -rw-r--r-- | src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp index c3b9efaa..7df49307 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp @@ -226,11 +226,10 @@ void QGeoPositionInfoSourceWinRT::setPreferredPositioningMethods(QGeoPositionInf PositioningMethods previousPreferredPositioningMethods = preferredPositioningMethods(); QGeoPositionInfoSource::setPreferredPositioningMethods(methods); if (previousPreferredPositioningMethods == preferredPositioningMethods() - || d->initState != InitializationState::Uninitialized) { + || d->initState == InitializationState::Uninitialized) { return; } - Q_ASSERT(d->initState != InitializationState::Initializing); const bool needsRestart = d->positionToken.value != 0 || d->statusToken.value != 0; if (needsRestart) @@ -257,7 +256,6 @@ void QGeoPositionInfoSourceWinRT::setUpdateInterval(int msec) return; } - Q_ASSERT(d->initState != InitializationState::Initializing); // minimumUpdateInterval is initialized to the lowest possible update interval in init(). // Passing 0 will cause an error on Windows 10. // See https://docs.microsoft.com/en-us/uwp/api/windows.devices.geolocation.geolocator.reportinterval |