diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-05-03 14:49:28 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-05-03 15:24:29 +0000 |
| commit | d61a9ddc13a4fca19dbbf35ef9b607c6d676a4b2 (patch) | |
| tree | a33a995a2bcb7a09a5be037deac96701f6af040f /src/location/labs | |
| parent | 3a03829cb854c299da220a073cae58614d72c5cb (diff) | |
| download | qtlocation-d61a9ddc13a4fca19dbbf35ef9b607c6d676a4b2.tar.gz | |
Let QDeclarativeNavigator::{start,stop} update m_active
QDeclarativeNavigator should call QNavigatorManager::start() inside
QDeclarativeNavigator::start(), however because we were already updating
m_active in QDeclarativeNavigator::setActive(), the call for
QNavigationManager::start() never happens.
Task-number: QTBUG-68066
Change-Id: I486381fdec7fc77ac977ee46683fabd2465cf799
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/location/labs')
| -rw-r--r-- | src/location/labs/qdeclarativenavigator.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp index 475cb650..bcb74c90 100644 --- a/src/location/labs/qdeclarativenavigator.cpp +++ b/src/location/labs/qdeclarativenavigator.cpp @@ -312,10 +312,8 @@ void QDeclarativeNavigator::start() return; } - if (d_ptr->m_active) - return; - - d_ptr->m_active = d_ptr->m_navigationManager->start(); + if (!d_ptr->m_navigationManager->active()) + d_ptr->m_active = d_ptr->m_navigationManager->start(); } void QDeclarativeNavigator::stop() @@ -325,10 +323,8 @@ void QDeclarativeNavigator::stop() return; } - if (!d_ptr->m_active) - return; - - d_ptr->m_active = d_ptr->m_navigationManager->stop(); + if (d_ptr->m_navigationManager->active()) + d_ptr->m_active = d_ptr->m_navigationManager->stop(); } void QDeclarativeNavigator::pluginReady() |