From dc384a2376a13ae2a8776ea0eda7d6e2fd088a64 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Tue, 22 Jan 2019 09:03:09 +0100
Subject: [PATCH] winrt: Remove incorrect asserts and fix incorrect condition
setPreferredPositioningMethods and setUpdateInterval are called by init so
these functions should not assert in initializing state.
Additionally the early exit condition in setPreferredPositioningMethods
has to be the same as in setUpdateInterval. Both cases have to return
early if the locator has not been initialized. This initialization
happens in init, so both states, Initializing and Initialized, are fine
for further handling.
Change-Id: I4ef8db7178c38299328041a8d163a1b9bbecc5b1
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
---
src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index fe783bd2b..821d2e9f7 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
--
GitLab