diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-26 12:22:00 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-26 12:22:38 +0200 |
commit | d340bf2be1738f3d47bc455ea122aef9a9e1c11d (patch) | |
tree | 34d060b00cf14924d50c6419e9678804d9f62e58 /src/plugins/position | |
parent | 66a6e238876cc1201c5fe331c165ceba458dc56a (diff) | |
parent | 592c381564e3f12b79a3d5e9fec5aec2b8045742 (diff) | |
download | qtlocation-d340bf2be1738f3d47bc455ea122aef9a9e1c11d.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
Diffstat (limited to 'src/plugins/position')
-rw-r--r-- | src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java b/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java index edc39bd7..1ea0c071 100644 --- a/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java +++ b/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java @@ -229,8 +229,11 @@ public class QtPositioning implements LocationListener static private void removeActiveListener(int androidClassKey) { QtPositioning listener = runningListeners.remove(androidClassKey); - locationManager.removeUpdates(listener); - listener.setActiveLooper(false); + + if (listener != null) { + locationManager.removeUpdates(listener); + listener.setActiveLooper(false); + } } |