diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:36 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:45 +0200 |
| commit | d0166d20086086fc5c4a8e437ed83fd389ee8643 (patch) | |
| tree | 1928c60e483465d4ef8218c801a008afedba99b7 /src/location/labs/qdeclarativenavigator.cpp | |
| parent | d44838125389720e4352dd51ad1da02f4cb58dc8 (diff) | |
| parent | 139414573ab27bd1df1b491aeb6003a6fc0d3d5d (diff) | |
| download | qtlocation-d0166d20086086fc5c4a8e437ed83fd389ee8643.tar.gz | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b
Diffstat (limited to 'src/location/labs/qdeclarativenavigator.cpp')
| -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() |